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

[Rex Dieter]

Summary of changes:

  5d21eb4... 4.11.4 (*)
  5600f96... 4.11.5 (*)
  a171500... Revert "4.11.5" (*)
  a1d87b0... Revert "4.11.4" (*)
  b449caf... Merge branch 'master' into f20 (*)

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