Merge branch 'release-v3.4-solc-0.7' of…

Merge branch 'release-v3.4-solc-0.7' of github.com:OpenZeppelin/openzeppelin-contracts into upstream-v3.4-solc-0.7-patched

contracts/package.json

 {
   "name": "@openzeppelin/contracts-upgradeable",
   "description": "Secure Smart Contract library for Solidity",
-  "version": "3.4.1-solc-0.7",
+  "version": "3.4.1-solc-0.7-2",
   "files": [
     "**/*.sol",
     "/build/contracts/*.json",

contracts/token/ERC721/ERC721.sol

@@ -449,7 +449,12 @@ contract ERC721 is Context, ERC165, IERC721, IERC721Metadata, IERC721Enumerable
         return (retval == _ERC721_RECEIVED);
     }
 
-    function _approve(address to, uint256 tokenId) private {
+    /**
+     * @dev Approve `to` to operate on `tokenId`
+     *
+     * Emits an {Approval} event.
+     */
+    function _approve(address to, uint256 tokenId) internal virtual {
         _tokenApprovals[tokenId] = to;
         emit Approval(ERC721.ownerOf(tokenId), to, tokenId); // internal owner
     }

package-lock.json

 {
   "name": "openzeppelin-solidity",
-  "version": "3.4.1-solc-0.7",
+  "version": "3.4.1-solc-0.7-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -2,7 +2,7 @@
   "private": true,
   "name": "openzeppelin-solidity",
   "description": "Secure Smart Contract library for Solidity",
-  "version": "3.4.1-solc-0.7",
+  "version": "3.4.1-solc-0.7-2",
   "files": [
     "/contracts/**/*.sol",
     "/build/contracts/*.json",