Fix for topic excerpt being from the wrong post
Merge remote-tracking branch 'upstream/master' into import_facebook
Remove setting updated_at