Merge pull request #567 from Masterminds/fix/566

Fixes #566: Cross link errors vary within Go based on os/arch.