new urls for gh-pages2
Merge branch 'master' into gh-pages2