[kdf] (3 commits) ...Merge branch 'master' into f21

[Rex Dieter]

Summary of changes:

  a47f0db... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_M (*)
  52b7432... Revert "- Rebuilt for https://fedoraproject.org/wiki/Fedora (*)
  cef36ab... Merge branch 'master' into f21 (*)

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