Merge remote-tracking branch 'upstream/develop' into 1702-null-date

diff --cc boot.php
Simple merge

diff --cc include/Contact.php
Simple merge

diff --cc include/cron.php
Simple merge

diff --cc include/dbstructure.php
Simple merge

diff --cc include/onepoll.php
Simple merge

diff --cc include/poller.php
Simple merge

diff --cc include/security.php
Simple merge

diff --cc include/socgraph.php
Simple merge

diff --cc include/uimport.php
Simple merge