Merge branch 'MDL-66900' of https://github.com/paulholden/moodle