Merge branch 'MDL-58781_34' of https://github.com/aanabit/moodle into MOODLE_34_STABLE