Update to 1.1 / Merge branch 'v1.1'