Merge branch 'master' into taiste

core/templates/core/404.jinja

@@ -2,7 +2,12 @@
 
 {% block content %}
 
-<h3>{% trans %}404, Not Found{% endtrans %}</h3>
+<div id="page">
+	<h3>{% trans %}404, Not Found{% endtrans %}</h3>
+	<p class="alert alert-red">
+		{{ exception }}
+	</p>
+</div>
 
 {% endblock %}
 

core/views/__init__.py

@@ -72,7 +72,9 @@ def forbidden(request, exception):
 
 
 def not_found(request, exception):
-    return HttpResponseNotFound(render(request, "core/404.jinja"))
+    return HttpResponseNotFound(
+        render(request, "core/404.jinja", context={"exception": exception})
+    )
 
 
 def internal_servor_error(request):