Next development version
Merge branch '1.0.x' into 1.1.x
Merge branch '1.1.x'