Merge branch 'develop' of https://github.com/bwmarrin/Discordgo into develop

restapi.go

@@ -152,11 +152,11 @@ func (s *Session) UserUpdate(userID, email, password, username, avatar, newPassw
 	// If left blank, avatar will be set to null/blank
 
 	data := struct {
-		Email       string     `json:"email"`
-		Password    string     `json:"password"`
-		Username    string     `json:"username"`
-		Avatar      string     `json:"avatar,omitempty"`
-		NewPassword json.Token `json:"new_password,omitempty"`
+		Email       string `json:"email"`
+		Password    string `json:"password"`
+		Username    string `json:"username"`
+		Avatar      string `json:"avatar,omitempty"`
+		NewPassword string `json:"new_password,omitempty"`
 	}{email, password, username, avatar, newPassword}
 
 	body, err := s.Request("PATCH", USER(userID), data)

voice.go

@@ -299,7 +299,7 @@ func (s *Session) VoiceUDPKeepalive(i time.Duration) {
 	// into it.  Then send that over the UDP connection to Discord
 
 	ticker := time.NewTicker(i * time.Millisecond)
-	for range ticker.C {
+	for _ = range ticker.C {
 		sb := make([]byte, 8)
 		sb[0] = 0x80
 		sb[1] = 0xc9