Merge 1.6.x into master