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