Merge branch 'master' into 6277-check_manifest_validity
authorradhika <radhika@curoverse.com>
Wed, 5 Aug 2015 18:29:10 +0000 (14:29 -0400)
committerradhika <radhika@curoverse.com>
Wed, 5 Aug 2015 18:29:10 +0000 (14:29 -0400)

Trivial merge