Summary of changes: 3bc7949... Upstream update. (*) f9c2bf5... Merge remote-tracking branch 'origin/f19' into f18 (*) 0d9c399... Merge remote-tracking branch 'origin/f18' into f17 (*) This commit already existed in another branch; no separate mail sent