Merge branch 'wip-MDL-25697-master' of git://github.com/samhemelryk/moodle