Upgrade canvas to 1.1.x

The problem referenced in #887 seems to be fixed so we should be able to upgrade canvas to 1.1.x.