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

[Rex Dieter]

Summary of changes:

  63c3075... 4.8.4 (*)
  e4adcc5... 4.8.5 (*)
  6360fa0... Merge branch 'master' into f17 (*)
  bd58ac3... Merge branch 'f18' into f17 (*)
  fa0bce6... Merge branch 'f18' into f17 (*)
  557795b... Merge branch 'f18' into f17 (*)
  f92d211... Merge branch 'f18' into f17 (*)
  b830ed7... Merge branch 'f18' into f17 (*)

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