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