Move json-rpc branch to master