PR #329 - RocketChat/homeserver