Merge pull request #452 from ndawe/master

[MRG] make Canvas and Pad context managers