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