Fix panic on read timeouts
Merge branch 'master' into priority