Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements

Conflicts:
	web/react/components/popover_list_members.jsx
	web/react/components/user_profile.jsx

1 files changed, 2 insertions, 1 deletions

diff --git a/api/preference_test.go b/api/preference_test.go
index 9d3db9e2f..eaa92fe47 100644
--- a/api/preference_test.go
+++ b/api/preference_test.go
@@ -60,9 +60,10 @@ func TestGetAllPreferences(t *testing.T) {
 
 	Client.LoginByEmail(team.Name, user2.Email, "pwd")
 
+	// note that user2 will automatically have a preference set for them to show user1 for direct messages
 	if result, err := Client.GetAllPreferences(); err != nil {
 		t.Fatal(err)
-	} else if data := result.Data.(model.Preferences); len(data) != 0 {
+	} else if data := result.Data.(model.Preferences); len(data) != 1 {
 		t.Fatal("received the wrong number of preferences")
 	}
 }