Add option to include background image when saving as image
Draw gray background when saving image if background is not valid
Merge pull request #637 from sean-h/master

Add option to include background image when saving as image
Merge branch 'master', remote-tracking branch 'upstream/master'