Merge 1.2.8 into master