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

[Rex Dieter]

Summary of changes:

  1effd5b... 4.11.4 (*)
  6448818... 4.11.5 (*)
  6fdd130... Revert "4.11.5" (*)
  9a3ed2f... Revert "4.11.4" (*)
  fbecba8... Merge branch 'master' into f20 (*)

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