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

[Rex Dieter]

Summary of changes:

  2449c52... 4.11.4 (*)
  5a393b5... 4.11.5 (*)
  6bbe26d... Revert "4.11.5" (*)
  2f69ab5... Revert "4.11.4" (*)
  ff0c957... Merge branch 'master' into f20 (*)

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