[kactivities] (5 commits) ...Merge branch 'master' into f20

[Rex Dieter]

Summary of changes:

  804285d... 4.11.4 (*)
  e9c7e8a... 4.11.5 (*)
  ecbcc4b... Revert "4.11.5" (*)
  3cae12a... Revert "4.11.4" (*)
  a1ef42b... Merge branch 'master' into f20 (*)

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