Warning settings
Merge branch 'origin/master'