Merge branch 'develop'
Fixing GLUT on Windows
Merge from master
[CONCERTO] Build Updates
[MERGE] Merge conflicts