[pull] develop from RocketChat:develop#294

pull[bot] merged 1 commit into

code:developcode/app-rocket.chat:developfrom

RocketChat:developRocketChat/Rocket.Chat:developCopy head branch name to clipboard