Implemented JC-1542
Merge branch 'master' of github.com:jtalks-org/jcommune