Merge @buggyj's CLA signature