Use relative urls instead of absolute
Merge branch 'master' into gh-pages