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