Merge branch '1.6'