Summary of changes: e01a2c7... Upstream update. (*) 3bcaa9b... Merge remote-tracking branch 'origin/f18' into f17 (*) f60b607... Merge remote-tracking branch 'origin/f17' into f16 (*) This commit already existed in another branch; no separate mail sent