Encode and unencode urls only as required (#7654)
Encode and unencode urls only as required (#7654)

Merge pull request 7654
chrisfinazzo/jekyll,fulldecent/jekyll,tillgrallert/jekyll,tillgrallert/jekyll,chrisfinazzo/jekyll,jaybe-jekyll/jekyll,jaybe-jekyll/jekyll,jekyll/jekyll,jaybe-jekyll/jekyll,Strangehill/jekyll,fulldecent/jekyll,tillgrallert/jekyll,x-way/jekyll,Strangehill/jekyll,jekyll/jekyll,Strangehill/jekyll,ryanshaw/jekyll,ryanshaw/jekyll,ryanshaw/jekyll,yhironaka/yhironaka.github.io,Strangehill/jekyll,chrisfinazzo/jekyll,tillgrallert/jekyll,tillgrallert/jekyll,x-way/jekyll,fulldecent/jekyll,jekyll/jekyll,jaybe-jekyll/jekyll,chrisfinazzo/jekyll,ryanshaw/jekyll,jekyll/jekyll,fulldecent/jekyll,x-way/jekyll,Strangehill/jekyll,x-way/jekyll