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