Make approve method compliant with ERC20#446

jakub-wojciechowski wants to merge 2 commits intoOpenZeppelin:masterOpenZeppelin/openzeppelin-contracts:masterfrom

jakub-wojciechowski:masterjakub-wojciechowski/zeppelin-solidity:masterCopy head branch name to clipboard