Merge branch 'MDL-46705-master' of git://github.com/dkns/moodle