Merge pull request #1124 from sipa/rpcobj3