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

[Rex Dieter]

Summary of changes:

  fc07687... 4.11.4 (*)
  995a8f0... 4.11.5 (*)
  dc9fbb2... Revert "4.11.5" (*)
  5b995fd... Revert "4.11.4" (*)
  dcebe39... Merge branch 'master' into f20 (*)

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