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

[Rex Dieter]

Summary of changes:

  bf226be... 4.8.4 (*)
  3de48bf... 4.8.5 (*)
  302af06... Merge branch 'master' into f17 (*)
  44d10a8... Merge branch 'master' into f17 (*)
  dba30e1... Merge branch 'f18' into f17 (*)
  bba50bd... Merge branch 'f18' into f17 (*)
  be2c7ac... Merge branch 'f18' into f17 (*)
  5296505... Merge branch 'f18' into f17 (*)
  3a409cb... Merge branch 'f18' into f17 (*)

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