Summary of changes: a03fd61... Merge branch 'master' into f18 (*) bcb8d47... Merge branch 'f18' into f17 (*) (*) This commit already existed in another branch; no separate mail sent