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