Merge branch 'MDL-70711-M39' of git://github.com/kordan/moodle into MOODLE_39_STABLE