Merge pull request #736 from rg3/retry