Merge branch 'MDL-35762_fix' of git://github.com/andyjdavis/moodle