MDL-47494 gapselect: Merge branch 'MOODLE_21_STABLE'