Merge branch 'MDL-63919' of git://github.com/stronk7/moodle