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

Trivial merge