Accidental merge into 1.x from gh-pages