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