ELIS 2.2.0.16
Merge remote-tracking branch 'rl/MOODLE_22_STABLE' into MOODLE_22_STABLE