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

v2.1.1

contracts/mocks/ERC20MintableMock.sol

@@ -1,11 +1,9 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.5.0;
 
 import "../token/ERC20/ERC20Mintable.sol";
 import "./MinterRoleMock.sol";
 
-
 contract ERC20MintableMock is ERC20Mintable, MinterRoleMock {
-
     constructor() public {
         ERC20Mintable.initialize(msg.sender);
     }