Merge branch '1.1.x' into stable