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

[Rex Dieter]

Summary of changes:

  301279f... 4.11.4 (*)
  5fa5c7c... 4.11.5 (*)
  a21140b... Revert "4.11.5" (*)
  bb4f568... Revert "4.11.4" (*)
  a119f0d... Merge branch 'master' into f20 (*)

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