Merge branch '1.x' into master