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

[Rex Dieter]

Summary of changes:

  1b4f17f... 4.11.4 (*)
  e525683... 4.11.5 (*)
  0ae6fae... Revert "4.11.5" (*)
  58942ea... Revert "4.11.4" (*)
  8eb5d44... Merge branch 'master' into f20 (*)

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