Merge pull request #3111 from directhex/sed-before-sign