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