nl2br
Merge branch 'nl2br'