solving issue of hanging worker threads
Merge branch 'master' into diff

Conflicts:
	src/common/storage/server.js