Merge upstream master into patched/master

docs/modules/ROOT/pages/erc721.adoc

@@ -30,12 +30,11 @@ contract GameItem is ERC721URIStorage {
         public
         returns (uint256)
     {
-        _tokenIds.increment();
-
         uint256 newItemId = _tokenIds.current();
         _mint(player, newItemId);
         _setTokenURI(newItemId, tokenURI);
 
+        _tokenIds.increment();
         return newItemId;
     }
 }