merging 1.2 to master

merge 1.2 into master