Merge branch 'master' into 6859-fix-invalid-manifests
authorradhika <radhika@curoverse.com>
Tue, 18 Aug 2015 04:06:49 +0000 (00:06 -0400)
committerradhika <radhika@curoverse.com>
Tue, 18 Aug 2015 04:06:49 +0000 (00:06 -0400)

Trivial merge