Merge "Pull in cleaned version.h header."