Switched back to using Uri.EscapeDataString after some further research; Code cleanup;
Merge branch 'master' of https://github.com/restsharp/RestSharp