Add Json::encode.
Merge remote-tracking branch 'origin/master'