Update from lwjgl:master