Merge commit 'upstream/master'

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

diff --cc include/poller.php
index 499483d,90a9786..499483d
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