Add more timeouts for potentially long-running commands.
Merge remote-tracking branch 'upstream/master'