Backport editors/mg fixes from trunk.
Update 'joyent' and 'wip' submodules.
Merge branch 'joyent/feature/miscfix/2014Q1' into joyent/release/2014Q1