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

[Rex Dieter]

Summary of changes:

  88bad71... 4.8.4 (*)
  9a003ea... 4.8.5 (*)
  4cadde3... Merge branch 'master' into f17 (*)
  fa3f36f... Merge branch 'f18' into f17 (*)
  368bba3... Merge branch 'f18' into f17 (*)
  910eece... Merge branch 'f18' into f17 (*)
  3755e2e... Merge branch 'f18' into f17 (*)
  0609eff... Merge branch 'f18' into f17 (*)

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