This is 1.1
This is 1.2-dev
Merge branch '1.0-maintenance'