Merge origin/1.6 into 1.6-for-1.7 (using imerge)