The version3 branch is now identical to master with the exception of generate.xml. Instead of maintaining both, which tend to get out of sync, maintain two distinct version3.xml and master.xml (or version4) .xml files in master. Will need to ensure that future changes are compatible with generation of previous releases.