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