Commit before merge
Merge branch 'aws-release' of https://github.com/IVPR/Weave into aws-release