Merge branch 'MOODLE_21_STABLE' into install_21_STABLE