Merge branch 'master' into graphics
Miscellaneous fixes
Merge branch 'master' into graphics
Merge branch 'graphics' into markGraphics