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