Merge branch 'hotfix/0.6.14'
Merge branch 'release/0.7.0'
force capistrano to use bash
Merge branch 'hotfix/0.7.1' into develop