V2.6.1.6 - CONTRIB-5211
Merge branch 'MOODLE_26' of github.com:gjb2048/moodle-format_topcoll into MOODLE_26_upstream