Miscellaneous fixes
Merge branch 'master' into master_cleanup
Merge branch 'master_cleanup' into graphics_cleanup