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

Trivial merge