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