Merge pull request #842 from jeffgbutler/new-join-syntax

Merge pull request #842 from jeffgbutler/new-join-syntax #456