Merge pull request #1131 from bradking/improve-EdgeFinished-signature