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

[Rex Dieter]

Summary of changes:

  6a1d779... 4.8.4 (*)
  4081e09... 4.8.5 (*)
  0fad7d1... Merge branch 'master' into f17 (*)
  b223e3c... Merge branch 'master' into f17 (*)
  d4324a5... Merge branch 'f18' into f17 (*)
  e1bc98e... Merge branch 'f18' into f17 (*)
  5bbe0ce... Merge branch 'f18' into f17 (*)
  60e9749... Merge branch 'f18' into f17 (*)

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