rescue timeout errors
Merge branches 'master' and 'production' into production
increase read timeout to 3 seconds
Merge branch 'master' into production