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

[Rex Dieter]

Summary of changes:

  c778ef6... 4.11.4 (*)
  43ee1e3... 4.11.5 (*)
  93c4fcb... Revert "4.11.5" (*)
  3f0bf60... Revert "4.11.4" (*)
  32157fa... Merge branch 'master' into f20 (*)

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