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