Merge remote-tracking branch 'upstream/3.5.2rc' into 1706-lock

author Michael <heluecht@pirati.ca>

Sun, 4 Jun 2017 19:06:40 +0000 (19:06 +0000)

committer Michael <heluecht@pirati.ca>

Sun, 4 Jun 2017 19:06:40 +0000 (19:06 +0000)
author Michael <heluecht@pirati.ca>
Sun, 4 Jun 2017 19:06:40 +0000 (19:06 +0000)
committer Michael <heluecht@pirati.ca>
Sun, 4 Jun 2017 19:06:40 +0000 (19:06 +0000)
diff --cc include/dbstructure.php
Simple merge
diff --cc include/poller.php
Simple merge
author	Michael <heluecht@pirati.ca>
	Sun, 4 Jun 2017 19:06:40 +0000 (19:06 +0000)
committer	Michael <heluecht@pirati.ca>
	Sun, 4 Jun 2017 19:06:40 +0000 (19:06 +0000)
		1	2
include/dbstructure.php	patch \|	diff1 \|	diff2 \|	blob \| history
include/poller.php	patch \|	diff1 \|	diff2 \|	blob \| history