use $text instead of text to not be rendered as attribute
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'