critter related updates
Merge remote-tracking branch 'upstream/master'
Karma updates, still trying to get them right (new tests added)