Merge upstream openzeppelin-contracts into upstream-patched

docs/contract.hbs

@@ -12,20 +12,13 @@
 
 {{natspec.devdoc}}
 
-{{#if modifiers}}
+{{#if ownModifiers}}
 [.contract-index]
 .Modifiers
 --
-{{#each inheritedItems}}
-{{#unless @first}}
-[.contract-subindex-inherited]
-.{{contract.name}}
-{{/unless}}
-{{#each modifiers}}
+{{#each ownModifiers}}
 * {xref-{{slug anchor~}} }[`++{{name}}({{args.names}})++`]
 {{/each}}
-
-{{/each}}
 --
 {{/if}}
 
@@ -34,6 +27,7 @@
 .Functions
 --
 {{#each inheritedItems}}
+{{#if (or @first (ne contract.name "Context"))}}
 {{#unless @first}}
 [.contract-subindex-inherited]
 .{{contract.name}}
@@ -42,6 +36,7 @@
 * {xref-{{slug anchor~}} }[`++{{name}}({{args.names}})++`]
 {{/each}}
 
+{{/if}}
 {{/each}}
 --
 {{/if}}