fix version brokenness and prepare for next release
18 files changed