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