ok to 0.8.1
Merge branch 'trigger-happy-0.8.1'