[kbruch] (10 commits) ...Merge branch 'f18' into f17

[Rex Dieter]

Summary of changes:

  d2cfe7b... 4.8.4 (*)
  bc54786... 4.8.5 (*)
  3ccb53f... Merge branch 'master' into f17 (*)
  30419bc... Merge branch 'f18' into f17 (*)
  48fc6d1... Merge branch 'f18' into f17 (*)
  cddef71... Merge branch 'f18' into f17 (*)
  908f45c... 4.9.5 (*)
  b5ac5cf... Merge branch 'f18' into f17 (*)
  44b7b6d... Merge branch 'master' into f18 (*)
  f6393be... Merge branch 'f18' into f17 (*)

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