merged with commit 9149545fb0be2615b751fc0d2bd15b3c80445d7e of https://code.google.com/p/rpcz/