Merge branch 'release/v1.7.1'
Fix heroku command in deploy rake task. #1
Merge branch 'hotfix/1.7.1.1' into develop