Merge remote-tracking branch 'doug/master'
Merge branch 'master' into openGL2