Merge branch 'MDL-61305-master-fix' of https://github.com/andrewnicols/moodle