Merge remote-tracking branch 'github/master'
Merge branch 'master' of github.com:yelite/Canvas