Merge branch 'wip-MDL-40847-m26' of git://github.com/samhemelryk/moodle