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

[Rex Dieter]

Summary of changes:

  498530d... 4.11.4 (*)
  99de2ee... 4.11.5 (*)
  ca53343... Revert "4.11.5" (*)
  987d53d... Revert "4.11.4" (*)
  41891bd... Merge branch 'master' into f20 (*)

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