Summary of changes: 4d6c3f1... Upstream update. (*) 7cf4bd1... Merge remote-tracking branch 'origin/master' into f20 (*) 13a5d0c... Merge remote-tracking branch 'origin/f20' into f19 (*) This commit already existed in another branch; no separate mail sent