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