Merge branch 'master' into joystickname

Conflicts:
	src/x11_joystick.c

tests/joysticks.c

@@ -200,7 +200,7 @@ int main(void)
         exit(EXIT_FAILURE);
     }
 
-    glfwSetWindowSizeCallback(window_size_callback);
+    glfwSetWindowSizeCallback(window, window_size_callback);
 
     glfwMakeContextCurrent(window);
     glfwSwapInterval(1);