Merge branch 'master' into gsn-beta

.editorconfig

@@ -6,7 +6,12 @@ root = true
 [*]
 charset = utf-8
 end_of_line = lf
-indent_size = 2
 indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
+
+[*.sol]
+indent_size = 4
+
+[*.js]
+indent_size = 2

contracts/token/ERC20/ERC20.sol

@@ -217,7 +217,7 @@ contract ERC20 is IERC20 {
     }
 
     /**
-     * @dev Destoys `amount` tokens from `account`.`amount` is then deducted
+     * @dev Destroys `amount` tokens from `account`.`amount` is then deducted
      * from the caller's allowance.
      *
      * See {_burn} and {_approve}.

scripts/coverage.sh

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -o errexit
+
 SOLIDITY_COVERAGE=true scripts/test.sh
 
 if [ "$CI" = true ]; then