The attached patch, while 40 lines longer, reduces CPU time on the build machines, and doesn't require the use of imagemagick.
The attached patch, while 40 lines longer, reduces CPU time on the build machines, and doesn't require the use of imagemagick.