Merge branch 'rest-improvements' of github.com:datacratic/soa
Merge branch 'master' of github.com:datacratic/soa