Backport lang/mercury fixes from trunk.
Merge branch 'joyent/feature/miscfix/2013Q2' into joyent/release/2013Q2