RPC perf fix (thanks CSR!)
Merge branch 'master' into vorbisfile-cs