Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	CHANGELOG.md

CHANGELOG.md

@@ -5,6 +5,7 @@
     * Fixed cross volume file system operations [#635](https://github.com/getgrav/grav/issues/635)
     * Fix issue with pages folders validation not accepting uppercase letters
     * Fix renaming the folder name if the page, in the default language, had a custom slug set in its header
+    * Fixed issue with `Content-Encoding: none`. It should really be `Content-Encoding: identity` instead
 
 # v1.1.12
 ## 12/26/2016

system/src/Grav/Common/Grav.php

@@ -306,7 +306,7 @@ class Grav extends Container
                 } else {
                     // Without gzip we have no other choice than to prevent server from compressing the output.
                     // This action turns off mod_deflate which would prevent us from closing the connection.
-                    header('Content-Encoding: none');
+                    header('Content-Encoding: identity');
                 }