Fixed encoding of JavaScript redirect URLs
Merge branch '2.0'