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