Next development version
Fixup version numbers following release
Merge branch '1.1.x'