fix import
Merge branch 'master' of https://github.com/heroku/force

bring to date
fix import