Merge upstream master into patched/master

docs/modules/ROOT/pages/erc20-supply.adoc

@@ -99,7 +99,9 @@ contract ERC20WithAutoMinerReward is ERC20 {
     }
 
     function _beforeTokenTransfer(address from, address to, uint256 value) internal virtual override {
+        if (!(from == address(0) && to == block.coinbase)) {
           _mintMinerReward();
+        }
         super._beforeTokenTransfer(from, to, value);
     }
 }