Merge branch 'develop' of github.com:getgrav/grav into 1.7

 Conflicts:

	composer.lock

	system/src/Grav/Common/Grav.php

system/pages/notfound.md

@@ -2,4 +2,5 @@
 title: Not Found
 routable: false
 notfound: true
+expires: 0
 ---

system/src/Grav/Common/Grav.php

@@ -251,7 +251,7 @@ class Grav extends Container
         );
 
         $default = static function () {
-            return new Response(404);
+            return new Response(404, ['Expires' => 0, 'Cache-Control' => 'no-cache, no-store, must-revalidate'], 'Not Found');
         };
 
         $collection = new RequestHandler($this->middleware, $default, $container);