Update version tags for recent upstream merge.