Merge tag 'v2.1.1' of github.com:OpenZeppelin/openzeppelin-solidity

v2.1.1

contracts/mocks/MinterRoleMock.sol

@@ -1,8 +1,7 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.5.0;
 
 import "../access/roles/MinterRole.sol";
 
-
 contract MinterRoleMock is MinterRole {
     constructor() public {
         MinterRole.initialize(msg.sender);
@@ -13,6 +12,7 @@ contract MinterRoleMock is MinterRole {
     }
 
     function onlyMinterMock() public view onlyMinter {
+        // solhint-disable-previous-line no-empty-blocks
     }
 
     // Causes a compilation error if super._removeMinter is not internal