Merge branch 'develop' into 'master'

add TimeOut value into vhost.

See merge request !9
3 jobs for master in 1 minute and 23 seconds (queued for 2 seconds)