Merge branch 'wip-MDL-36215-m24' of git://github.com/samhemelryk/moodle into MOODLE_2...