Backed out changeset: 11b622e99485

- Tutorial18 : instancing fix

- Duplicate line

Merge with default

- Fix for Makefile generation on Mac

Merge with 2.1

- GLFW compilation bugfix on Linux

- Merged bugfixes from 3.3 branch