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