Merge "Better punctuation in uploadstash-badtoken"