Prepared master branch for post-1.2 development.