Merge branch 'mdl46710-master' of https://github.com/tlock/moodle