Merge pull request #2219 from benthecarman/custom-closing-address