[kimono] (7 commits) ...Merge branch 'f18' into f17

[Rex Dieter]

Summary of changes:

  c55f0e7... 4.8.4 (*)
  e67f017... 4.8.5 (*)
  6906db5... Merge branch 'master' into f17 (*)
  ed80e91... Merge branch 'f18' into f17 (*)
  3cc0ba3... Merge branch 'f18' into f17 (*)
  8a99bc6... Merge branch 'f18' into f17 (*)
  8f16024... Merge branch 'f18' into f17 (*)

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