Merge branch 'MDL-43415-master' of git://github.com/zbdd/moodle