[parley/f18] (9 commits) ...Merge branch 'f18' into f17

[Rex Dieter]

Summary of changes:

  17b74b7... 4.8.4 (*)
  194ef0c... 4.8.4 (*)
  b98375b... 4.8.5 (*)
  da0af6f... Merge branch 'master' into f17 (*)
  1d677c1... Merge branch 'f18' into f17 (*)
  e7c8bec... Merge branch 'f18' into f17 (*)
  5f1ec3f... Merge branch 'f18' into f17 (*)
  dd8bd55... Merge branch 'f18' into f17 (*)
  ec489c6... Merge branch 'f18' into f17 (*)

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