Merge branch 'EGL' of github.com:elmindreda/glfw into EGL

Conflicts:
	include/GL/glfw3.h