Merge branches 'gh-pages' and 'master' into gh-pages
border fix