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