Merge "Update to support long version codes."