Merge branch 'master' into develop
Why not use the custom settings we already built?
Merge branch 'develop'