Summary of changes:

4691f05... 4.12.4 (*) 286c227... 4.12.5 (*) a5a2aa3... Revert "4.12.5" (*) 9cb6724... Revert "4.12.4" (*) 9edeeca... Merge branch 'master' into f20 (*) 87e2930... Merge branch 'master' into f20 (*)

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