Merge remote-tracking branch 'origin/master'
Add unit test to verify that merge keys are correctly implemented.
Implement merge keys.
Update version number.