Merge branch 'wip-MDL-26507' of git://github.com/sammarshallou/moodle