nowrap removed
Merge origin/master
style changed