Merge pull request #2738 from bitcoin