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