Merge pull request #1905 from tmccombs/release-automation