Merge branch '1.7' into master