Merge 1.6 dev into master