Merge branch 'MDL-62491-master-fix' of git://github.com/abgreeve/moodle