diff --git a/README.md b/README.md
index 0b29155e..c41f2070 100644
--- a/README.md
+++ b/README.md
@@ -63,6 +63,7 @@ GLFW bundles a number of dependencies in the `deps/` directory.
 ## Changelog
 
  - Bugfix: Initialization failed on headless systems
+ - Bugfix: The cached current context could get out of sync
 
 
 ## Contact
@@ -171,6 +172,7 @@ skills.
  - Julian Squires
  - Johannes Stein
  - Justin Stoecker
+ - Elviss Strazdins
  - Nathan Sweet
  - TTK-Bandit
  - Sergey Tikhomirov
diff --git a/src/context.c b/src/context.c
index 6212630b..215437bc 100644
--- a/src/context.c
+++ b/src/context.c
@@ -527,9 +527,7 @@ int _glfwStringInExtensionString(const char* string, const GLubyte* extensions)
 GLFWAPI void glfwMakeContextCurrent(GLFWwindow* handle)
 {
     _GLFWwindow* window = (_GLFWwindow*) handle;
-
     _GLFW_REQUIRE_INIT();
-
     _glfwPlatformMakeContextCurrent(window);
 }