Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-04-26 6c189dba224d1e1de138e763d8146fea21bc6a2f

 interface/web/help/index.php

@@ -13,4 +13,4 @@
  <p>&nbsp;</p>
</div>
</BODY>
</HTML>
</HTML>