Merge branch 'MDL-64313-35' of git://github.com/damyon/moodle into MOODLE_35_STABLE