prevent queues from quickly running out of items - fixes #712
Merge branch 'feature-endless-queues' into develop