Merge pull request #2974 from benthecarman/dang-value