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

[Rex Dieter]

Summary of changes:

  34d9677... 4.8.4 (*)
  b12a5d3... 4.8.5 (*)
  c684d0e... Merge branch 'master' into f17 (*)
  744c053... Merge branch 'f18' into f17 (*)
  bb86493... Merge branch 'f18' into f17 (*)
  fd82cf9... Merge branch 'f18' into f17 (*)
  98c9172... Merge branch 'f18' into f17 (*)
  da9ad5f... Merge branch 'f18' into f17 (*)

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