Merge with Trunk Revision 9613
Merge branch 'master' into lights_and_shadows
Model rendering code restructure initial check-in. May not compile yet.