Merge branch 'master' into 6859-fix-invalid-manifests
authorradhika <radhika@curoverse.com>
Tue, 25 Aug 2015 16:42:40 +0000 (12:42 -0400)
committerradhika <radhika@curoverse.com>
Tue, 25 Aug 2015 16:42:40 +0000 (12:42 -0400)

Trivial merge