updated to rust nightly on Fri, 18 July
merge commit

Conflicts:
	gl2.rs