Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-05-04 f6513f0be58f1dd441f3778f8a9d259bbc7267e4

 interface/web/help/index.php

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