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