Merge pull request #3539 from AndyHee/20170617-admin_settings