Merge pull request #1723 from Herlevsen/develop

Make default 404 page use 404 status code

modules/cms/classes/Controller.php

@@ -190,7 +190,7 @@ class Controller
         /*
          * If the page was not found, render the 404 page - either provided by the theme or the built-in one.
          */
-        if (!$page) {
+        if (!$page || $url === '404') {
             $this->setStatusCode(404);
 
             // Log the 404 request