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

[Rex Dieter]

Summary of changes:

  a8a18a3... 4.11.90 (*)
  104c246... 4.11.95 (*)
  ff26eab... 4.11.97 (*)
  ad725d2... 4.12.0 (*)
  9157516... 4.12.1 (*)
  4bd0e74... 4.12.2 (*)
  84dca6a... Revert "4.11.5"
  863f6ff... Revert "4.11.4"
  31e122a... Merge branch 'master' into f20

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