Dev complete. Merging dev-1.2 to master and adding 1.2 binary.