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