Merge branch 'master' into 6859-fix-invalid-manifests
authorradhika <radhika@curoverse.com>
Wed, 19 Aug 2015 18:22:13 +0000 (14:22 -0400)
committerradhika <radhika@curoverse.com>
Wed, 19 Aug 2015 18:22:13 +0000 (14:22 -0400)

Trivial merge