Update from mypaint/master

Update to Upstream