Merge branch 'w28_MDL-34175_m23_admin' of git://github.com/skodak/moodle into MOODLE_...