Bringing master in line with gh-pages