WIP
Merge branch 'feature/new-am' of github.com:continuuity/weave into feature/new-am