Fix windows compilation error
Merge remote-tracking branch 'origin/twitter-json' into twitter-json