Oops, needed to add another check to make sure group actually been picked
Merge branch 'master' into MOODLE_26_STABLE