Strip only over 30 characters
Merge branch 'master' into test