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

[Rex Dieter]

Summary of changes:

  fcf3a72... 4.11.90 (*)
  65f13e3... 4.11.95 (*)
  4c73aa0... 4.11.97 (*)
  588b573... 4.12.0 (*)
  ac4b921... 4.12.1 (*)
  bbe42e0... 4.12.2 (*)
  ad06e6f... Revert "4.11.5"
  b5198b4... Revert "4.11.4"
  d332228... Merge branch 'master' into f20

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