Fix #337 - don't promt for sudo passwd for non-existing directories
Merge remote-tracking branch 'upstream/master'