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