fix helpscout
Merge branch 'develop' of github.com:waltzio/waltz into develop