Fixed the join problem after performance serializer refactoring.
Merge branch 'perf' of github.com:rxin/shark into perf