propagate last Moodle 2.5 fixes