#JC-1188 Changes after code review.
Merge branch 'master' of git@github.com:jtalks-org/jcommune