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

[Rex Dieter]

Summary of changes:

  1c39855... 4.8.4 (*)
  5b83a8f... 4.8.5 (*)
  6d8b2bc... Merge branch 'master' into f17 (*)
  9a88620... Merge branch 'f18' into f17 (*)
  2ecae92... Merge branch 'f18' into f17 (*)
  a6c5c04... Merge branch 'f18' into f17 (*)
  5422101... Merge branch 'f18' into f17 (*)
  99cadfc... Merge branch 'f18' into f17 (*)

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