diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000000..7614d1b1b9b
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,19 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+# YAML requires indentation with spaces instead of tabs.
+[*.{js,yml,yaml}]
+indent_style = space
+indent_size = 2
+
+# Makefile requires tab indentation.
+[Makefile]
+indent_style = tab
+indent_size = 4
diff --git a/.gitattributes b/.gitattributes
index 4631c3bd3b8..bd70af630ce 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,5 @@
 # Properly detect languages on GitHub
 *.rst linguist-detectable=true
+
+# Normalize EOL for all files that Git considers text files
+* text=auto eol=lf
diff --git a/requirements.txt b/requirements.txt
index 82ea0fb0921..5a3367ad8b9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ sphinx==1.8.5  # pyup: <2.0.0
 sphinx_rtd_theme==0.4.3
 
 # Code tabs extension for GDScript/C#
-sphinx-tabs==1.1.13
+sphinx-tabs==3.2.0
 
 # Custom 404 error page (more useful than the default)
 sphinx-notfound-page==0.6