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

[Rex Dieter]

Summary of changes:

  e31d3a7... 4.8.4 (*)
  8cc09d3... 4.8.5 (*)
  344af34... Merge branch 'master' into f17 (*)
  e73384d... Merge branch 'master' into f17 (*)
  243fdbe... Merge branch 'f18' into f17 (*)
  83396d6... Merge branch 'f18' into f17 (*)
  68175ee... Merge branch 'f18' into f17 (*)
  c829d0f... Merge branch 'f18' into f17 (*)

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