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

[Rex Dieter]

Summary of changes:

  ba73815... 4.11.90 (*)
  660aab6... 4.11.95 (*)
  96ca110... 4.11.97 (*)
  e87a959... 4.12.0 (*)
  7b0c5a1... 4.12.1 (*)
  d90eabd... 4.12.2 (*)
  065ab57... Revert "4.11.5"
  04562aa... Revert "4.11.4"
  05e9d9c... Merge branch 'master' into f20

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