Merge branch 'master' into patch-1

diff --cc tweepy/api.py
index cbd168cd79ce0e95a45d14b61ba780f20537284e,baf0d541faccc639ad3102d9ae69199aac2aa126..c54d0b685b91796b4cc548cc03a6ad59a7f86219
--- 1/tweepy/api.py
--- 2/tweepy/api.py
+++ b/tweepy/api.py
@@@ -816,9 -856,7 +856,9 @@@ class API(object)
  
      @property
      def blocks_ids(self):
-         """ :reference: https://dev.twitter.com/rest/reference/get/blocks/ids 
 -        """ :reference: https://developer.twitter.com/en/docs/accounts-and-users/mute-block-report-users/api-reference/get-blocks-ids """
++        """ :reference: https://developer.twitter.com/en/docs/accounts-and-users/mute-block-report-users/api-reference/get-blocks-ids
 +            :allowed_param:'cursor'
 +        """
          return bind_api(
              api=self,
              path='/blocks/ids.json',