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