Next development version
Merge branch '1.0.x'