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

[Rex Dieter]

Summary of changes:

  ce24997... 4.8.4 (*)
  57f5e94... 4.8.5 (*)
  3fbaf6b... Merge branch 'master' into f17 (*)
  28698ed... Merge branch 'f18' into f17 (*)
  41d0279... Merge branch 'f18' into f17 (*)
  937f9ed... Merge branch 'f18' into f17 (*)
  0b86edc... Merge branch 'f18' into f17 (*)
  981fc01... Merge branch 'f18' into f17 (*)

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