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

[Rex Dieter]

Summary of changes:

  05d2266... 4.11.90 (*)
  f263b98... 4.11.95 (*)
  3ac75dc... 4.11.97 (*)
  bef62a2... 4.12.0 (*)
  ab9055e... 4.12.1 (*)
  08b3960... 4.12.2 (*)
  ec784f4... Revert "4.11.5"
  db08667... Revert "4.11.4"
  20d7713... Merge branch 'master' into f20

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