bugfix: restore border color AFTER resoring raster
Merge branch 'amigados' into goat