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