Merged branch 1.2 to master.