fix error in timeout computation am: 66261db8d2
am: f0217cdbde

* commit 'f0217cdbde4334bfe2fad7fa484cfa000241ea08':
  fix error in timeout computation