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