Update code from upstream.
+ Bill Chapple
Another image.