Fix #337 - don't promt for sudo passwd for non-existing directories
Pull in upstream changes