Merge branch 'MDL-67394-39' of https://github.com/paulholden/moodle into MOODLE_39_STABLE