Merge branch 'MDL-69387-39-2' of git://github.com/junpataleta/moodle into MOODLE_39_S...