use newer github url
Merge branch 'master' into gh-pages