Still more issues with urls

Stil
Merge branch 'master' into gh-pages