Merge branch 'release/0.8.1' into develop
Undo brunch-config.coffee
Merge branch 'develop'