Merge branch 'MDL-64672-master' of git://github.com/aanabit/moodle