Delete on clean, but preserve text
Merge branch '1.x' into gh-pages