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