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