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