fix for issue #180
Merge branch 'c2_fresh_start' of https://github.com/mozilla/collusion into c2_fresh_start