Makes it harder to accidentally undress yourself
Merge branch 'undress' into small-changes