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

v2.1.1

contracts/mocks/PullPaymentMock.sol

@@ -1,13 +1,10 @@
-pragma solidity ^0.4.24;
-
+pragma solidity ^0.5.0;
 
 import "../payment/PullPayment.sol";
 
-
 // mock class using PullPayment
 contract PullPaymentMock is PullPayment {
-
-    constructor() public payable {
+    constructor () public payable {
         PullPayment.initialize();
     }
 
@@ -15,5 +12,4 @@ contract PullPaymentMock is PullPayment {
     function callTransfer(address dest, uint256 amount) public {
         _asyncTransfer(dest, amount);
     }
-
 }