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