Merge pull request #322 from annando/1511-pumpio-timeout