Summary of changes: d09c781... Merge cleanup. (*) 29f7af3... Merge remote-tracking branch 'origin/f18' into f17 (*) 25818fa... Merge cleanup. (*) This commit already existed in another branch; no separate mail sent