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

v2.1.2

test/utils/Address.test.js

@@ -1,8 +1,8 @@
+require('openzeppelin-test-helpers');
+
 const AddressImpl = artifacts.require('AddressImpl');
 const SimpleToken = artifacts.require('SimpleTokenMock');
 
-require('../helpers/setup');
-
 contract('Address', function ([_, anyone]) {
   beforeEach(async function () {
     this.mock = await AddressImpl.new();