Update for language changes
Merge branch 'master' of https://github.com/mozilla-servo/rust-opengles into q3

Conflicts:
	gl2.rs