Merge "Fix message when a command times out."