Return RpcFailed instead of PbError when rescuing exceptions
Merge remote-tracking branch 'origin/master'