Merge branch 'master' into docking

# Conflicts:
#	docs/CHANGELOG.txt

examples/example_win32_directx11/main.cpp

@@ -174,6 +174,7 @@ int main(int, char**)
         //g_pSwapChain->Present(0, 0); // Present without vsync
     }
 
+    // Cleanup
     ImGui_ImplDX11_Shutdown();
     ImGui_ImplWin32_Shutdown();
     ImGui::DestroyContext();