fixing the user column on the topic-list page
local merge

Merge remote-tracking branch 'upstream/master'
Merge pull request #1718 from awesomerobot/master

fixing the user column on the topic-list page