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

[Rex Dieter]

Summary of changes:

  39787b6... 4.8.4 (*)
  ce52a24... 4.8.5 (*)
  b43ca05... Merge branch 'master' into f17 (*)
  1477537... Merge branch 'f18' into f17 (*)
  d74cef9... Merge branch 'f18' into f17 (*)
  440d693... Merge branch 'f18' into f17 (*)
  a1ce7a9... Merge branch 'f18' into f17 (*)
  4f6a8c3... Merge branch 'f18' into f17 (*)

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