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