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

v2.1.1

contracts/mocks/SecondaryMock.sol

@@ -1,13 +1,13 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.5.0;
 
 import "../ownership/Secondary.sol";
 
-
 contract SecondaryMock is Secondary {
     constructor() public {
         Secondary.initialize(msg.sender);
     }
 
     function onlyPrimaryMock() public view onlyPrimary {
+        // solhint-disable-previous-line no-empty-blocks
     }
 }