HVM-797 Vanquish Banquo's ghost
Merge branch 'joyent'