Merge remote-tracking branch 'upstream/develop' into 1702-only-worker

Conflicts:
	include/onepoll.php
	include/queue.php

diff --cc boot.php
Simple merge

diff --cc include/delivery.php
Simple merge

diff --cc include/onepoll.php
Simple merge

diff --cc include/poller.php
Simple merge