Avoid the 'scan' script, I believe it is harmful.
Merge branch 'joyent/feature/miscfix/2013Q2' into joyent/release/2013Q2