Merge branch 'master' of github.com:wphuman/WordPress-Settings-Module