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

[Rex Dieter]

Summary of changes:

  02d1881... 4.11.4 (*)
  796419a... 4.11.5 (*)
  c9f012e... Revert "4.11.5" (*)
  f3a178e... Revert "4.11.4" (*)
  07ef1df... Merge branch 'master' into f20 (*)

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