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