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

[Rex Dieter]

Summary of changes:

  797ea47... 4.8.4 (*)
  320c567... 4.8.5 (*)
  7d716e0... Merge branch 'master' into f17 (*)
  40abc42... Merge branch 'f18' into f17 (*)
  d368a58... Merge branch 'f18' into f17 (*)
  fb1da7d... Merge branch 'f18' into f17 (*)
  c286c99... Merge branch 'f18' into f17 (*)
  14cc756... Merge branch 'f18' into f17 (*)

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