Merge branch 'MDL-64285-34' of git://github.com/junpataleta/moodle into MOODLE_34_STABLE