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