Merge branch 'MDL-69297-39' of git://github.com/peterRd/moodle into MOODLE_39_STABLE