[jovie/f18] (9 commits) ...Merge branch 'f18' into f17

[Rex Dieter]

Summary of changes:

  c32e5c3... 4.8.4 (*)
  edd3a5e... 4.8.5 (*)
  772e6f3... Merge branch 'master' into f17 (*)
  2af2a51... Merge branch 'f18' into f17 (*)
  10fda87... Merge branch 'f18' into f17 (*)
  72993e9... Merge branch 'f18' into f17 (*)
  82b8c2d... Merge branch 'f18' into f17 (*)
  1bb02bf... Merge branch 'master' into f17 (*)
  0e05509... Merge branch 'f18' into f17 (*)

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