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

[Rex Dieter]

Summary of changes:

  addf569... 4.8.4 (*)
  70d0e1c... 4.8.5 (*)
  148c1e6... Merge branch 'master' into f17 (*)
  bd4bd6a... Merge branch 'f18' into f17 (*)
  52f44e9... Merge branch 'f18' into f17 (*)
  577f8cb... Merge branch 'f18' into f17 (*)
  ded70f6... Merge branch 'f18' into f17 (*)
  f9594b7... Merge branch 'f18' into f17 (*)

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