Merge tag 'v2.1.2' of github.com:OpenZeppelin/openzeppelin-solidity into merge-v2.1

v2.1.2

package.json

@@ -1,17 +1,17 @@
 {
   "name": "openzeppelin-eth",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "Secure Smart Contract library for Solidity",
   "files": [
     "build",
     "contracts",
-    "test",
+    "test/behaviors",
     "zos.json",
     "zos.*.json"
   ],
   "scripts": {
     "build": "scripts/build.sh",
-    "compile": "scripts/compile.sh",
+    "compile": "truffle compile",
     "console": "truffle console",
     "coverage": "scripts/coverage.sh",
     "lint": "npm run lint:js && npm run lint:sol",
@@ -43,7 +43,6 @@
   "homepage": "https://github.com/OpenZeppelin/openzeppelin-eth",
   "devDependencies": {
     "chai": "^4.1.2",
-    "chai-bignumber": "^2.0.2",
     "coveralls": "^3.0.1",
     "eslint": "^4.19.1",
     "eslint-config-standard": "^10.2.1",
@@ -56,11 +55,11 @@
     "ethjs-abi": "^0.2.1",
     "ganache-cli": "6.1.8",
     "npm-install-peers": "^1.2.1",
+    "openzeppelin-test-helpers": "^0.1.1",
     "pify": "^4.0.1",
     "solhint": "^1.5.0",
     "solidity-coverage": "^0.5.4",
-    "truffle": "^4.1.13",
-    "web3-utils": "^1.0.0-beta.34",
+    "truffle": "^5.0.0",
     "zos": "^2.0.0",
     "zos-lib": "^2.1.0"
   },