optionally get filename from job parameters
Merge remote-tracking branch 'upstream/master'

Conflicts:
	bin/uws