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