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

[Rex Dieter]

Summary of changes:

  f7439f3... 4.8.4 (*)
  fe125ac... 4.8.5 (*)
  1887140... Merge branch 'master' into f17 (*)
  27d8715... Merge branch 'f18' into f17 (*)
  c14a768... Merge branch 'f18' into f17 (*)
  b521202... Merge branch 'f18' into f17 (*)
  0af60db... Merge branch 'f18' into f17 (*)
  4cf3ebb... Merge branch 'f18' into f17 (*)

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