changes made by Olof
Merge commit '09dfcbc8991a240766e61e2bf7903845d6200480' into 1.0

Conflicts:
	Bricks/DataCollectQueueBrick.py