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