Merge branch 'MDL-62117-master-fix' of git://github.com/andrewnicols/moodle