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