Use the cwd option of run instead of chdir since chdir isn't supported remotely
Merge remote-tracking branch 'atrodo/patch-1' into development