attempt 2 for gitflow plugin
merging 'feature-testing2' into 'develop'