Merge branch 'MDL-68683-39-fix' of git://github.com/lameze/moodle into MOODLE_39_STABLE