Merge branch 'MDL-56726-master-cfgadmin' of git://github.com/mudrd8mz/moodle