Merge branch 'MDL-69632-master-adminserversettings' of git://github.com/mudrd8mz...