[smokeqt] (5 commits) ...Merge branch 'master' into f20

[Rex Dieter]

Summary of changes:

  1409a61... 4.11.4 (*)
  78f3754... 4.11.5 (*)
  018c9e2... Revert "4.11.5" (*)
  632418d... Revert "4.11.4" (*)
  7ce8e72... Merge branch 'master' into f20 (*)

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