Fixed an encoding problem with urls.
Merge branch 'master' into production