Update for merge to gh-pages