Merge upstream openzeppelin-contracts into upstream-patched

contracts/token/ERC721/ERC721.sol

@@ -367,8 +367,7 @@ contract ERC721 is Context, ERC165, IERC721, IERC721Metadata {
      * transferred to `to`.
      * - When `from` is zero, `tokenId` will be minted for `to`.
      * - When `to` is zero, ``from``'s `tokenId` will be burned.
-     * - `from` cannot be the zero address.
-     * - `to` cannot be the zero address.
+     * - `from` and `to` are never both zero.
      *
      * To learn more about hooks, head to xref:ROOT:extending-contracts.adoc#using-hooks[Using Hooks].
      */

contracts/utils/escrow/Escrow.sol

@@ -36,8 +36,7 @@ contract Escrow is Ownable {
      */
     function deposit(address payee) public payable virtual onlyOwner {
         uint256 amount = msg.value;
-        _deposits[payee] = _deposits[payee] + amount;
-
+        _deposits[payee] += amount;
         emit Deposited(payee, amount);
     }