Merge branch 'v1.1.x'