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

[Rex Dieter]

Summary of changes:

  b87c89d... 4.11.4 (*)
  5d077c5... 4.11.5 (*)
  3682c12... Revert "4.11.5" (*)
  ad1f7ef... Revert "4.11.4" (*)
  89cfcde... Merge branch 'master' into f20 (*)

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