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