include commit from johnrthomas, resolve conflict
include commit from johnrthomas, resolve conflict

JohnRThomas/opengl-examples,runewake2/opengl-examples,JohnRThomas/opengl-examples,runewake2/opengl-examples,JohnRThomas/opengl-examples,runewake2/opengl-examples,JohnRThomas/opengl-examples,runewake2/opengl-examples