Summary of changes: 8b655cf... Rebase to git commit cd6b557 (*) 860c7b5... Rebase to git commit 96569f8 (*) 6cdf0a0... Merge branch 'master' into f16 (*) This commit already existed in another branch; no separate mail sent