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