Really duplicate fix #808
Merge branch 'v1.0' into v1.1
Merge branch 'v1.1'