Merge upstream master into patched/master

docs/modules/ROOT/pages/governance.adoc

@@ -134,6 +134,7 @@ For 3) we will use GovernorCountingSimple, a module that offers 3 options to vot
 Besides these modules, Governor itself has some parameters we must set.
 
 votingDelay: How long after a proposal is created should voting power be fixed. A large voting delay gives users time to unstake tokens if necessary.
+
 votingPeriod: How long does a proposal remain open to votes.
 
 These parameters are specified in number of blocks. Assuming block time of around 13.14 seconds, we will set votingDelay = 1 day = 6570 blocks, and votingPeriod = 1 week = 45992 blocks.

scripts/release/update-comment.js

@@ -4,7 +4,7 @@ const fs = require('fs');
 const glob = require('glob');
 const proc = require('child_process');
 
-const gitStatus = proc.execFileSync('git', ['status', '--porcelain', '-uno', 'contracts']);
+const gitStatus = proc.execFileSync('git', ['status', '--porcelain', '-uno', 'contracts/**/*.sol']);
 
 if (gitStatus.length > 0) {
   console.error('Contracts directory is not clean');