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