Summary of changes: 0c354f9... Use the -u option when diffing (*) 35af6af... Merge branch 'master' into f16 (*) (*) This commit already existed in another branch; no separate mail sent