Canvas

Merge branch 'canvas' into 'master'. Canvas is now done.