Merge pull request #2649 from benthecarman/display-outpoint