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

v2.1.1

contracts/mocks/ERC20WithMetadataMock.sol

@@ -1,11 +1,10 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.5.0;
 
 import "../token/ERC20/ERC20.sol";
 import "../drafts/ERC1046/TokenMetadata.sol";
 
-
 contract ERC20WithMetadataMock is ERC20, ERC20WithMetadata {
-    constructor(string tokenURI) public {
+    constructor (string memory tokenURI) public {
         ERC20WithMetadata.initialize(tokenURI);
     }
 }