use relative path so gh-pages works
Merge branch 'master' into gh-pages