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