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

[Rex Dieter]

Summary of changes:

  8ab50be... 4.8.4 (*)
  faa2154... 4.8.5 (*)
  01333ea... Merge branch 'master' into f17 (*)
  f09bae0... Merge branch 'f18' into f17 (*)
  fc74710... Merge branch 'f18' into f17 (*)
  3041b38... Merge branch 'f18' into f17 (*)
  eebe538... Merge branch 'f18' into f17 (*)
  607e440... Merge branch 'f18' into f17 (*)

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