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