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

[Rex Dieter]

Summary of changes:

  e9624db... 4.8.4 (*)
  cbb039c... 4.8.5 (*)
  98d4036... Merge branch 'master' into f17 (*)
  616e0da... Merge branch 'f18' into f17 (*)
  e535025... Merge branch 'f18' into f17 (*)
  050f296... Merge branch 'f18' into f17 (*)
  f7a3825... Merge branch 'f18' into f17 (*)
  8c7bc99... Merge branch 'f18' into f17 (*)

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