[pull] develop from RocketChat:develop#630

pull[bot] merged 2 commits into

code:developcode/app-rocket.chat:developfrom

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