use empty string rather than slash in favor of relative path
Merge branch 'master' into gh-pages