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

[Rex Dieter]

Summary of changes:

  26911f2... 4.8.4 (*)
  dcf8d91... 4.8.5 (*)
  7c63322... Merge branch 'master' into f17 (*)
  59605ae... Merge branch 'f18' into f17 (*)
  8b66a0c... Merge branch 'f18' into f17 (*)
  f090d52... Merge branch 'f18' into f17 (*)
  033d68f... Merge branch 'f18' into f17 (*)
  cfded79... Merge branch 'f18' into f17 (*)

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