Merge branch 'develop' into develop-next

Conflicts:
	css/thread.css

css/thread.css

@@ -31,6 +31,8 @@
   background-color: #ffffff;
   margin: 0;
   padding: 0.9em;
+  word-wrap: break-word;
+  overflow-x: auto;
 }
 .thread-body a:focus {
   outline: thin dotted;