Fixing versioning problem during merge with Apache.