Try to resolve dependency problems in previous.
Merge branch 'joyent/feature/pbulkmulti/2013Q1' into joyent/release/2013Q1
Update 'wip' submodule.