Merge branch 'release-1.1'
Add diff