Merge pull request #850 from billhollings/master

Support screen captures.