Return nil for comment of there isn’t a current user. Scope decorator appropriately.
Merge branch 'master' into production