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