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

[Rex Dieter]

Summary of changes:

  d09ee79... 4.11.4 (*)
  6717e15... 4.11.5 (*)
  fa54b92... Revert "4.11.5" (*)
  bc1b4dc... Revert "4.11.4" (*)
  b8fb6a3... Merge branch 'master' into f20 (*)

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