Remove adding <br> from encodeHTML
Merge remote-tracking branch 'origin/master'