[pull] master from mattermost:master#817

pull[bot] merged 2 commits into

code:mastercode/app-mattermost:masterfrom

mattermost:mastermattermost/mattermost:masterCopy head branch name to clipboard