Fix combining workers.  Closes #1856
Merge remote-tracking branch 'origin/kml' into nm

Conflicts:
	build.xml