Merge branch 'MDL-54120' of git://github.com/aolley/moodle