Removing command-timeout override
Merge remote-tracking branch 'origin/master'