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