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

[Rex Dieter]

Summary of changes:

  5ae7290... 4.8.4 (*)
  d84a5ef... 4.8.5 (*)
  3e2d0f4... Merge branch 'master' into f17 (*)
  aa5612f... Merge branch 'master' into f17 (*)
  fb8ef76... Merge branch 'f18' into f17 (*)
  cdf38b2... Merge branch 'f18' into f17 (*)
  a407c1a... Merge branch 'f18' into f17 (*)
  0537db1... Merge branch 'f18' into f17 (*)

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