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

[Rex Dieter]

Summary of changes:

  60ff856... 4.8.4 (*)
  3f0579b... 4.8.5 (*)
  cb07859... Merge branch 'master' into f17 (*)
  c5c5856... Merge branch 'f18' into f17 (*)
  4cc5e83... Merge branch 'f18' into f17 (*)
  33c0534... Merge branch 'f18' into f17 (*)
  9198c78... Merge branch 'f18' into f17 (*)
  2e47326... Merge branch 'f18' into f17 (*)

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