Merge branch 'm20_MDL-26063_SCORM_grouping' of git://github.com/danmarsden/moodle