Merge branch 'wip-MDL-37683-m25' of git://github.com/samhemelryk/moodle