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

[Rex Dieter]

Summary of changes:

  fb3d943... 4.8.4 (*)
  2a1bc05... 4.8.5 (*)
  84b3623... Merge branch 'master' into f17 (*)
  bcfd185... Merge branch 'f18' into f17 (*)
  ebe6a3a... Merge branch 'f18' into f17 (*)
  decc4d4... Merge branch 'f18' into f17 (*)
  c1be416... Merge branch 'f18' into f17 (*)
  239a271... Merge branch 'f18' into f17 (*)

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