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