Walking soldier! Fixes & changes in the graphics sub-system.
Merge remote-tracking branch 'origin/master'