Merge branch 'develop' of github.com:nvie/gitflow into develop