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