Merge "Implement a new bsdiff format"