Fix for bootstrap overriding CSS for an activity label
Merge branch 'master' into MOODLE_26_STABLE