Merge pull request #2991 from optout21/txsigs-splicing