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

[Rex Dieter]

Summary of changes:

  8fa5b76... 4.8.4 (*)
  4ce0b2c... 4.8.5 (*)
  3c39ea9... Merge branch 'master' into f17 (*)
  7ed3a93... Merge branch 'f18' into f17 (*)
  7fbe8c0... Merge branch 'f18' into f17 (*)
  b212fb9... Merge branch 'f18' into f17 (*)
  b166e72... Merge branch 'f18' into f17 (*)
  2203217... Merge branch 'f18' into f17 (*)

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