Document -t timeout option
Merge branch 'master' of github.com:canboat/canboat