test commit and settings for the outgoing style
Merge remote-tracking branch 'origin/master'