The applied version had missing blank lines that prevented fast-import
round-tripping, missed comments on some test files, and a data length
mistake that was also corrected by "fbce70 A fix for a slightly broken
test file."

Merge the corrected version to get the remaining fixes into master.