Merge branch 'development' of github.com:0xProject/0x-monorepo into feature/plp-integration

# Conflicts:
#	packages/asset-swapper/package.json

contracts/erc20-bridge-sampler/CHANGELOG.json

@@ -10,7 +10,8 @@
                 "note": "Use liquidity provider registry in sampler",
                 "pr": 2499
             }
-        ]
+        ],
+        "timestamp": 1582837861
     },
     {
         "timestamp": 1582677073,

contracts/erc20-bridge-sampler/CHANGELOG.md

@@ -5,6 +5,11 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.5.0 - _February 27, 2020_
+
+    * Add generic liquidity provider sampling (#2487)
+    * Use liquidity provider registry in sampler (#2499)
+
 ## v1.4.2 - _February 26, 2020_
 
     * Dependencies updated

contracts/erc20-bridge-sampler/contracts/src/ERC20BridgeSampler.sol

@@ -562,8 +562,8 @@ contract ERC20BridgeSampler is
             makerToken
         );
         (bool didSucceed, bytes memory returnData) = registryAddress.staticcall(callData);
-        if (didSucceed) {
-            return LibBytes.readAddress(returnData, 0);
+        if (didSucceed && returnData.length == 32) {
+            return LibBytes.readAddress(returnData, 12);
         }
     }
 

contracts/erc20-bridge-sampler/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-erc20-bridge-sampler",
-    "version": "1.4.2",
+    "version": "1.5.0",
     "engines": {
         "node": ">=6.12"
     },
@@ -51,13 +51,13 @@
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md",
     "devDependencies": {
         "@0x/abi-gen": "^5.2.2",
-        "@0x/contracts-asset-proxy": "^3.2.3",
-        "@0x/contracts-erc20": "^3.1.3",
-        "@0x/contracts-exchange": "^3.2.3",
-        "@0x/contracts-exchange-libs": "^4.3.3",
+        "@0x/contracts-asset-proxy": "^3.2.4",
+        "@0x/contracts-erc20": "^3.1.4",
+        "@0x/contracts-exchange": "^3.2.4",
+        "@0x/contracts-exchange-libs": "^4.3.4",
         "@0x/contracts-gen": "^2.0.8",
-        "@0x/contracts-test-utils": "^5.3.0",
-        "@0x/contracts-utils": "^4.4.1",
+        "@0x/contracts-test-utils": "^5.3.1",
+        "@0x/contracts-utils": "^4.4.2",
         "@0x/dev-utils": "^3.2.1",
         "@0x/sol-compiler": "^4.0.8",
         "@0x/tslint-config": "^4.0.0",