Code clean-up.
Merge branch 'master' into ui-improvements
Getting save as image dialog box to show correctly.
More work on save as image dialog box.
More work on save as image dialog box.
More work on save as image dialog box.
More work on save as image dialog box.
More work on save as image dialog box.
More work on save as image dialog box.
More work on save as image dialog box.
More work on save as image dialog box.
More work on save as image dialog box.
More work on save as image dialog box.
More work on save as image dialog box.