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

[Rex Dieter]

Summary of changes:

  bfeaaf3... 4.11.4 (*)
  70787ff... 4.11.5 (*)
  5a31781... Revert "4.11.5" (*)
  f726b9c... Revert "4.11.4" (*)
  d0558ae... Merge branch 'master' into f20 (*)

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