Merge

merge 1.2 fixes into master