Summary of changes: 5a40a02... - verify some properties of replaced and wrong-colored file (*) 5d0960e... Merge branch 'master' into f15 (*) This commit already existed in another branch; no separate mail sent