fixed handling of --temp-path

Conflicts:
	CHANGELOG