Delete on clean, but preserve text
Merge branch '1.x'
Merge pull request #79 from morgante/master

Merge pull request #1 from jakiestfu/master
Merge pull request #3 from jakiestfu/master

Upstream