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