Merge branch 'stable' into develop

Changelog.md

@@ -58,6 +58,7 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.
 
 ## Bug fixes
 * Fix indentation and a link title on the default home page [#6212](https://github.com/diaspora/diaspora/pull/6212)
+* Bring peeping Tom on the 404 page back [#6226](https://github.com/diaspora/diaspora/pull/6226)
 
 ## Features
 

app/assets/stylesheets/error_pages.scss

 @import 'colors';
 @import 'mixins';
 
+html { min-height: 100%; }
+
 #big-number {
   font-family: Roboto-BoldCondensed, Helvetica, Arial, sans-serif;
   font-size: 250px;
@@ -27,7 +29,6 @@
 #error_404 {
   width: 100%;
   height: 100%;
-  position: fixed;
   bottom:0px;
   margin: 0px;
   font-family: Roboto, Helvetica, Arial, sans-serif;
@@ -35,6 +36,7 @@
   text-shadow: 0 1px 0 #fff;
   color: #666;
   background: image-url("peeping-tom.png") no-repeat bottom;
+  background-attachment: fixed;
 
   #big-number {
     font-family: Roboto-BoldCondensed, Helvetica, Arial, sans-serif;