Merge branch 'master' into develop
Merge branch 'develop' of github.com:Tout/trubl into develop
Watermark update endpoint support.
Support optional "by" for tout reject/publish