Merge commit 'upstream/master'

diff --cc htconfig.php
index 63a40c8090417866535283e73af7dc7347a6bc36,9d9c8a2c791ddd185a2d68949f4add5c5d6c76ec..63a40c8090417866535283e73af7dc7347a6bc36
mode 100755,100644..100644
--- 1/htconfig.php
--- 2/htconfig.php
+++ b/htconfig.php

diff --cc include/poller.php
index 499483d007dea6ecaffde1d9c4d0fffb420e79e3,90a97867c204e5abae28479262c8729e5320b242..499483d007dea6ecaffde1d9c4d0fffb420e79e3
mode 100755,100644..100644
--- 1/include/poller.php
--- 2/include/poller.php
+++ b/include/poller.php

diff --cc view/theme/diabook/style-network.css
Simple merge

diff --cc view/theme/diabook/style-profile.css
Simple merge

diff --cc view/theme/diabook/style.css
Simple merge