Merge branch '1.4.x' into 1.5.x

wilkinsona · wilkinsona · commit 6d8846d95b8f · 2017-04-04T09:27:35.000+01:00
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,3 @@
+[*]
+indent_style = tab
+indent_size = 4
