Merge branch 'hotfix/osx-sed'
Merge branch 'develop' of github.com:eriknomitch/persistent-working-directory into develop