Developing towards v1.2 in master branch now