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