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