Merge pull request #1669 from micmac1/master-jsonrpc-portable