[kdiamond] (3 commits) ...Merge branch 'master' into f19

[Rex Dieter]

Summary of changes:

  6861ea5... 4.10.5 (*)
  fe7ad76... Revert "4.10.5" (*)
  ce087e8... Merge branch 'master' into f19 (*)

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