[cantor] (11 commits) ...Merge branch 'f18' into f17

[Rex Dieter]

Summary of changes:

  9fc0d2e... 4.8.4 (*)
  5dc88fe... 4.8.5 (*)
  9a31200... Merge branch 'master' into f17 (*)
  b513d66... Merge branch 'f18' into f17 (*)
  f16ae70... Merge branch 'f18' into f17 (*)
  f384c4a... Merge branch 'f18' into f17 (*)
  8d72dff... 4.9.5 (*)
  33d84ab... Merge branch 'f18' into f17 (*)
  20de9c9... Merge branch 'master' into f18 (*)
  99e98dc... Merge branch 'master' into f17 (*)
  fd5715c... Merge branch 'f18' into f17 (*)

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