fixed rentpath side quote
Merge branch 'master' into merge-test
Merge branch 'merge-test' into gh-pages