Merge branch 4.x

modules/js/test/test_imgproc.js

@@ -552,7 +552,7 @@ QUnit.test('test_filter', function(assert) {
         cv.stackBlur(src, src, new cv.Size(3, 3));
 
         // Verify result.
-        let expected = new Uint8Array([22,29,36,38,43,50]);
+        let expected = new Uint8Array([14,22,29,46,51,58]);
 
         assert.deepEqual(src.data, expected);
         src.delete();

modules/js/test/test_mat.js

@@ -173,7 +173,7 @@ QUnit.test('test_mat_creation', function(assert) {
     //   clone
     {
         let mat = cv.Mat.ones(5, 5, cv.CV_8UC1);
-        let mat2 = mat.mat_clone();
+        let mat2 = mat.clone();
 
         assert.equal(mat.channels, mat2.channels);
         assert.equal(mat.size().height, mat2.size().height);