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