JMA - Further updates to unify() for more consistency with the ruby version
Merge branch 'feature/extend-support-subweave' into feature/extend-support-subweave-local-osx-10.8.5