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

[Rex Dieter]

Summary of changes:

  e080a8c... 4.11.90 (*)
  112c70b... 4.11.95 (*)
  0a2cf5a... 4.11.97 (*)
  3f78360... 4.12.0 (*)
  0a87b4b... 4.12.1 (*)
  33c038b... 4.12.2 (*)
  b8d519f... Revert "4.11.5"
  b638ac3... Revert "4.11.4"
  276fa7a... Merge branch 'master' into f20

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