Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 interface/web/themes/default/templates/error.tpl.htm

@@ -4,6 +4,5 @@
   <ol>
      <li>###ERRORMSG###</li>
   </ol>
   <div>TODO: WRONG HTML ELEMENTS</div>
  </div>
</div>