Only add OPTION_JOBS to the command line if it's set
copy a couple more pdb files
Merge branch 'minor-tweaks' into dev