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