Merge "Add a version field to the v4 signature file format"