Wyatt/1.3.5 merge conflicts#3971

GregTheGreek merged 7 commits into

release/1.3.5web3/web3.js:release/1.3.5from

wyatt/1.3.5-merge-conflictsweb3/web3.js:wyatt/1.3.5-merge-conflictsCopy head branch name to clipboard