Merge branch 'GL3_0.8.5'
Merge branch 'CinderGL3'

Conflicts:
	lib/libcinder_d.a