Merge branch 'wip-MDL-36576-m23' of git://github.com/amygroshek/moodle into MOODLE_23...