version dump after merge with upstream, since the upstream version was the same bump as mine