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

[Rex Dieter]

Summary of changes:

  7db0131... 4.8.4 (*)
  ae7140b... 4.8.5 (*)
  174bf74... Merge branch 'master' into f17 (*)
  5b3d3b4... Merge branch 'f18' into f17 (*)
  df99548... Merge branch 'f18' into f17 (*)
  e29e829... Merge branch 'f18' into f17 (*)
  11facc9... Merge branch 'f18' into f17 (*)
  dc58301... Merge branch 'f18' into f17 (*)

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