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