Merged recent 1.6 branch changes into master