Merge branch 'release/2.0.14' into develop
Merge branch 'master' of github.com:ellzey/RProxy