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

[Rex Dieter]

Summary of changes:

  94e4d64... 4.11.4 (*)
  69f59cc... 4.11.5 (*)
  6236fe9... Revert "4.11.5" (*)
  bfcba98... Revert "4.11.4" (*)
  ba447a2... Merge branch 'master' into f20 (*)

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