url fixes
Merge branch '1.x' into gh-pages