[kmousetool/f18] (8 commits) ...Merge branch 'f18' into f17

[Rex Dieter]

Summary of changes:

  740c818... 4.8.4 (*)
  9837fae... 4.8.5 (*)
  8875e75... Merge branch 'master' into f17 (*)
  f917605... Merge branch 'f18' into f17 (*)
  ed40f34... Merge branch 'f18' into f17 (*)
  9f2676d... Merge branch 'f18' into f17 (*)
  0321627... Merge branch 'f18' into f17 (*)
  f688370... Merge branch 'f18' into f17 (*)

(*) This commit already existed in another branch; no separate mail sent