check the url against the locale as well
Merge branch 'refs/heads/master' into 2.1