bug-1208: all names shown on all text lines
Merge branch 'bug-1208' into testserver-stable