Support the unique flag.
Remove extraneous debug message.
Merge branch 'join'