Prevent list prefix from including appended NL, #418
Merge branch 'od/issue_418' into develop