My preferred settings.
Merge branch 'master' into favorite