Merge branch '6859-fix-invalid-manifests' refs #6859
authorTom Clegg <tom@curoverse.com>
Thu, 27 Aug 2015 15:32:08 +0000 (11:32 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 27 Aug 2015 15:32:08 +0000 (11:32 -0400)

Trivial merge