Pull in @mlandis's changes to gh-pages branch.