Merge branch 'MDL-39472-master' of git://github.com/sammarshallou/moodle