Merge branch 'master' into test-extcodehash

Author: fulldecent

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: [xpepermint, MoMannn, fulldecent] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

src/contracts/tokens/nf-token-metadata.sol

@@ -107,7 +107,7 @@ contract NFTokenMetadata is
    * @notice This is an internal function which should be called from user-implemented external
    * function. Its purpose is to show and properly initialize data structures when using this
    * implementation.
-   * @param _tokenId Id for which we want uri.
+   * @param _tokenId Id for which we want URI.
    * @param _uri String representing RFC 3986 URI.
    */
   function _setTokenUri(