Merge pull request #1791 from Hixie/custom-paint-saves

Assert that custom painters balance save/restores.