Make sure the log standardizes on 'timeout'
Merge pull request #1193 from tnm/patch-1

Make sure the log standardizes on 'timeout'