move line in config
concurrency fix: make sure forked process finished before reading output from it
Merge branch 'master' into zipmodule

Conflicts:
	nbproject/project.properties