Uniformized timeout message
Merge pull request #547 from nremond/conn_timeout

Uniformized timeout message