Copy up dev to master for release 1.2.0