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