Fixes tag support with wrap:false
Merge branch 'tags-nowrap-fix'