fix up context root path
Merge branch 'master' into extra-urbano