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