Merge remote-tracking branch 'origin/master' into tar-ge-v6.1.2

Author: archmoj

test/image/compare_pixels_test.js

@@ -130,7 +130,7 @@ for(var i = 0; i < allMockList.length; i++) {
                 'mapbox_layers',
                 'mapbox_custom-style',
                 'mapbox_geojson-attributes'
-            ].indexOf(mockName) !== -1 ? 0.5 : 0.15
+            ].indexOf(mockName) !== -1 ? 1 : 0.15
     });
 
     if(numDiffPixels) {