For #65, include a Bundle-Vendor value in manifest.
Merge branch '4.x'