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