Merge branch 'master' into multi-display-support

Conflicts:
	src/fullscreen.c
	src/win32_window.c
	src/x11_fullscreen.c

tests/reopen.c

@@ -62,7 +62,7 @@ static void window_size_callback(GLFWwindow window, int width, int height)
 static int window_close_callback(GLFWwindow window)
 {
     printf("Close callback triggered\n");
-    window_handle = NULL;
+    closed = GL_TRUE;
     return 0;
 }
 

tests/windows.c

@@ -66,7 +66,10 @@ int main(void)
 
         glfwSetWindowPos(windows[i], 100 + (i & 1) * 300, 100 + (i >> 1) * 300);
 
-        glClearColor((GLclampf) (i & 1), (GLclampf) (i >> 1), 0.0, 0.0);
+        glClearColor((GLclampf) (i & 1),
+                     (GLclampf) (i >> 1),
+                     i ? 0.0 : 1.0,
+                     0.0);
     }
 
     while (running)