Merge pull request #1465 from Montellese/jsonrpc_windows