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

state.go

@@ -325,6 +325,9 @@ func (s *State) Channel(channelID string) (*Channel, error) {
 		return nil, ErrNilState
 	}
 	
+	s.RLock()
+	defer s.RUnlock()
+
 	if c, ok := s.channelMap[channelID]; ok {
 		return c, nil
 	}