Upgraded to karma 0.12.1
Merge remote-tracking branch 'upstream/master'