properly handle duplicate names on join.
Merge branch 'Feature-ijoin'