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

[Rex Dieter]

Summary of changes:

  ff38531... 4.11.4 (*)
  4a6f710... 4.11.5 (*)
  db1b419... Revert "4.11.5" (*)
  f792604... Revert "4.11.4" (*)
  11ecb7c... Merge branch 'master' into f20 (*)

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