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

[Rex Dieter]

Summary of changes:

  0c48c66... 4.8.4 (*)
  cef5a57... 4.8.5 (*)
  46412b7... Merge branch 'master' into f17 (*)
  2ace30f... Merge branch 'f18' into f17 (*)
  acdabff... Merge branch 'f18' into f17 (*)
  e7e6e1f... Merge branch 'f18' into f17 (*)
  8708b5b... Merge branch 'f18' into f17 (*)
  e406bd0... Merge branch 'f18' into f17 (*)

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