draft commit
Merge branch 'develop' of https://github.com/ambled/weave-test-java into develop