Give more likely path to cleanup script in error message
Merge remote-tracking branch 'upstream/master'