(Issue 3474) Fix level 3 comments wrapping issue
Merge pull request #3476 from timdegroote/issue-3474

(Issue 3474) Fix level 3 comments wrapping issue
Merge origin/master and fix conflicts