working around stand alone test case for FD leaks
Merge branch 'switch'
Merge remote-tracking branch 'my/master'

Conflicts:
	tools/gstworker.c