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

[Rex Dieter]

Summary of changes:

  63f1f1d... 4.11.90 (*)
  01f6047... 4.11.95 (*)
  92d8107... 4.11.97 (*)
  4445b26... 4.12.0 (*)
  e29b76c... 4.12.1 (*)
  7c40bcc... 4.12.2 (*)
  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