prevent padding if special tag
Merge branch 'master' into edgarsbranch