Merge branch 'wip-MDL-36341-m24' of git://github.com/samhemelryk/moodle