diff --git a/.gitmodules b/.gitmodules
index f2e0d283..5938fa98 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "opencv"]
 	path = opencv
-	url = https://github.com/opencv/opencv.git
+	url = https://github.com/mbdevpl/opencv.git
 [submodule "opencv_contrib"]
 	path = opencv_contrib
 	url = https://github.com/opencv/opencv_contrib.git
diff --git a/.travis.yml b/.travis.yml
index 2b9b33c9..9bbd08a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,447 +62,244 @@ matrix:
 
     # default builds for MacOS
       #further jobs in the list will use the same stage until the next assignment
-    - stage: final
-      os: osx
-      osx_image: xcode8.3
-      env:
-        - MB_PYTHON_VERSION=2.7
-        - ENABLE_CONTRIB=0
-        - ENABLE_HEADLESS=0
-      workspaces:
-        use: brew_cache
-    - os: osx
-      osx_image: xcode8.3
-      env:
-        - MB_PYTHON_VERSION=3.5
-        - ENABLE_CONTRIB=0
-        - ENABLE_HEADLESS=0
-      workspaces:
-        use: brew_cache
-    - os: osx
-      osx_image: xcode8.3
-      env:
-        - MB_PYTHON_VERSION=3.6
-        - ENABLE_CONTRIB=0
-        - ENABLE_HEADLESS=0
-      workspaces:
-        use: brew_cache
-    - os: osx
-      osx_image: xcode8.3
-      env:
-        - MB_PYTHON_VERSION=3.7
-        - ENABLE_CONTRIB=0
-        - ENABLE_HEADLESS=0
-        - TEST_DEPENDS=numpy==1.14.5
-      workspaces:
-        use: brew_cache
-    - os: osx
-      osx_image: xcode8.3
-      env:
-        - MB_PYTHON_VERSION=3.8
-        - ENABLE_CONTRIB=0
-        - ENABLE_HEADLESS=0
-        - TEST_DEPENDS=numpy==1.17.3
-      workspaces:
-        use: brew_cache
-
-    # headless builds for MacOS
-    - os: osx
-      osx_image: xcode8.3
-      env:
-        - MB_PYTHON_VERSION=2.7
-        - ENABLE_CONTRIB=0
-        - ENABLE_HEADLESS=1
-      workspaces:
-        use: brew_cache
-    - os: osx
-      osx_image: xcode8.3
-      env:
-        - MB_PYTHON_VERSION=3.5
-        - ENABLE_CONTRIB=0
-        - ENABLE_HEADLESS=1
-      workspaces:
-        use: brew_cache
-    - os: osx
-      osx_image: xcode8.3
-      env:
-        - MB_PYTHON_VERSION=3.6
-        - ENABLE_CONTRIB=0
-        - ENABLE_HEADLESS=1
-      workspaces:
-        use: brew_cache
-    - os: osx
-      osx_image: xcode8.3
-      env:
-        - MB_PYTHON_VERSION=3.7
-        - ENABLE_CONTRIB=0
-        - ENABLE_HEADLESS=1
-        - TEST_DEPENDS=numpy==1.14.5
-      workspaces:
-        use: brew_cache
-    - os: osx
-      osx_image: xcode8.3
-      env:
-        - MB_PYTHON_VERSION=3.8
-        - ENABLE_CONTRIB=0
-        - ENABLE_HEADLESS=1
-        - TEST_DEPENDS=numpy==1.17.3
-      workspaces:
-        use: brew_cache
-
-    # Contrib builds for MacOS
-    - os: osx
-      osx_image: xcode8.3
-      env:
-        - MB_PYTHON_VERSION=2.7
-        - ENABLE_CONTRIB=1
-        - ENABLE_HEADLESS=0
-      workspaces:
-        use: brew_cache
-    - os: osx
-      osx_image: xcode8.3
-      env:
-        - MB_PYTHON_VERSION=3.5
-        - ENABLE_CONTRIB=1
-        - ENABLE_HEADLESS=0
-      workspaces:
-        use: brew_cache
-    - os: osx
-      osx_image: xcode8.3
-      env:
-        - MB_PYTHON_VERSION=3.6
-        - ENABLE_CONTRIB=1
-        - ENABLE_HEADLESS=0
-      workspaces:
-        use: brew_cache
-    - os: osx
-      osx_image: xcode8.3
-      env:
-        - MB_PYTHON_VERSION=3.7
-        - ENABLE_CONTRIB=1
-        - ENABLE_HEADLESS=0
-        - TEST_DEPENDS=numpy==1.14.5
-      workspaces:
-        use: brew_cache
-    - os: osx
-      osx_image: xcode8.3
-      env:
-        - MB_PYTHON_VERSION=3.8
-        - ENABLE_CONTRIB=1
-        - ENABLE_HEADLESS=0
-        - TEST_DEPENDS=numpy==1.17.3
-      workspaces:
-        use: brew_cache
-
-    # headless contrib builds for MacOS
-    - os: osx
-      osx_image: xcode8.3
-      env:
-        - MB_PYTHON_VERSION=2.7
-        - ENABLE_CONTRIB=1
-        - ENABLE_HEADLESS=1
-      workspaces:
-        use: brew_cache
-    - os: osx
-      osx_image: xcode8.3
-      env:
-        - MB_PYTHON_VERSION=3.5
-        - ENABLE_CONTRIB=1
-        - ENABLE_HEADLESS=1
-      workspaces:
-        use: brew_cache
-    - os: osx
-      osx_image: xcode8.3
-      env:
-        - MB_PYTHON_VERSION=3.6
-        - ENABLE_CONTRIB=1
-        - ENABLE_HEADLESS=1
-      workspaces:
-        use: brew_cache
-    - os: osx
-      osx_image: xcode8.3
-      env:
-        - MB_PYTHON_VERSION=3.7
-        - ENABLE_CONTRIB=1
-        - ENABLE_HEADLESS=1
-        - TEST_DEPENDS=numpy==1.14.5
-      workspaces:
-        use: brew_cache
-    - os: osx
-      osx_image: xcode8.3
-      env:
-        - MB_PYTHON_VERSION=3.8
-        - ENABLE_CONTRIB=1
-        - ENABLE_HEADLESS=1
-        - TEST_DEPENDS=numpy==1.17.3
-      workspaces:
-        use: brew_cache
+    # - stage: final
+    #   os: osx
+    #   osx_image: xcode8.3
+    #   env:
+    #     - MB_PYTHON_VERSION=3.6
+    #     - ENABLE_CONTRIB=0
+    #     - ENABLE_HEADLESS=0
+    #   workspaces:
+    #     use: brew_cache
+    # - os: osx
+    #   osx_image: xcode8.3
+    #   env:
+    #     - MB_PYTHON_VERSION=3.7
+    #     - ENABLE_CONTRIB=0
+    #     - ENABLE_HEADLESS=0
+    #     - TEST_DEPENDS=numpy==1.14.5
+    #   workspaces:
+    #     use: brew_cache
+    # - os: osx
+    #   osx_image: xcode8.3
+    #   env:
+    #     - MB_PYTHON_VERSION=3.8
+    #     - ENABLE_CONTRIB=0
+    #     - ENABLE_HEADLESS=0
+    #     - TEST_DEPENDS=numpy==1.17.3
+    #   workspaces:
+    #     use: brew_cache
+    #
+    # # headless builds for MacOS
+    # - os: osx
+    #   osx_image: xcode8.3
+    #   env:
+    #     - MB_PYTHON_VERSION=3.6
+    #     - ENABLE_CONTRIB=0
+    #     - ENABLE_HEADLESS=1
+    #   workspaces:
+    #     use: brew_cache
+    # - os: osx
+    #   osx_image: xcode8.3
+    #   env:
+    #     - MB_PYTHON_VERSION=3.7
+    #     - ENABLE_CONTRIB=0
+    #     - ENABLE_HEADLESS=1
+    #     - TEST_DEPENDS=numpy==1.14.5
+    #   workspaces:
+    #     use: brew_cache
+    # - os: osx
+    #   osx_image: xcode8.3
+    #   env:
+    #     - MB_PYTHON_VERSION=3.8
+    #     - ENABLE_CONTRIB=0
+    #     - ENABLE_HEADLESS=1
+    #     - TEST_DEPENDS=numpy==1.17.3
+    #   workspaces:
+    #     use: brew_cache
+    #
+    # # Contrib builds for MacOS
+    # - os: osx
+    #   osx_image: xcode8.3
+    #   env:
+    #     - MB_PYTHON_VERSION=3.6
+    #     - ENABLE_CONTRIB=1
+    #     - ENABLE_HEADLESS=0
+    #   workspaces:
+    #     use: brew_cache
+    # - os: osx
+    #   osx_image: xcode8.3
+    #   env:
+    #     - MB_PYTHON_VERSION=3.7
+    #     - ENABLE_CONTRIB=1
+    #     - ENABLE_HEADLESS=0
+    #     - TEST_DEPENDS=numpy==1.14.5
+    #   workspaces:
+    #     use: brew_cache
+    # - os: osx
+    #   osx_image: xcode8.3
+    #   env:
+    #     - MB_PYTHON_VERSION=3.8
+    #     - ENABLE_CONTRIB=1
+    #     - ENABLE_HEADLESS=0
+    #     - TEST_DEPENDS=numpy==1.17.3
+    #   workspaces:
+    #     use: brew_cache
+    #
+    # # headless contrib builds for MacOS
+    # - os: osx
+    #   osx_image: xcode8.3
+    #   env:
+    #     - MB_PYTHON_VERSION=3.6
+    #     - ENABLE_CONTRIB=1
+    #     - ENABLE_HEADLESS=1
+    #   workspaces:
+    #     use: brew_cache
+    # - os: osx
+    #   osx_image: xcode8.3
+    #   env:
+    #     - MB_PYTHON_VERSION=3.7
+    #     - ENABLE_CONTRIB=1
+    #     - ENABLE_HEADLESS=1
+    #     - TEST_DEPENDS=numpy==1.14.5
+    #   workspaces:
+    #     use: brew_cache
+    # - os: osx
+    #   osx_image: xcode8.3
+    #   env:
+    #     - MB_PYTHON_VERSION=3.8
+    #     - ENABLE_CONTRIB=1
+    #     - ENABLE_HEADLESS=1
+    #     - TEST_DEPENDS=numpy==1.17.3
+    #   workspaces:
+    #     use: brew_cache
 
     # default builds for Linux
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=2.7
-        - ENABLE_CONTRIB=0
-        - ENABLE_HEADLESS=0
-      cache:
-        directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=2.7
-        - UNICODE_WIDTH=16
-        - ENABLE_CONTRIB=0
-        - ENABLE_HEADLESS=0
-      cache:
-        directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=2.7
-        - PLAT=i686
-        - ENABLE_CONTRIB=0
-        - ENABLE_HEADLESS=0
-      cache:
-        directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=2.7
-        - PLAT=i686
-        - UNICODE_WIDTH=16
-        - ENABLE_CONTRIB=0
-        - ENABLE_HEADLESS=0
-      cache:
-        directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.5
-        - ENABLE_CONTRIB=0
-        - ENABLE_HEADLESS=0
-      cache:
-        directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.5
-        - PLAT=i686
-        - ENABLE_CONTRIB=0
-        - ENABLE_HEADLESS=0
-      cache:
-        directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.6
-        - ENABLE_CONTRIB=0
-        - ENABLE_HEADLESS=0
-        - TEST_DEPENDS=numpy==1.11.3
-      cache:
-        directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.6
-        - PLAT=i686
-        - ENABLE_CONTRIB=0
-        - ENABLE_HEADLESS=0
-        - TEST_DEPENDS=numpy==1.11.3
-      cache:
-        directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.7
-        - ENABLE_CONTRIB=0
-        - ENABLE_HEADLESS=0
-        - TEST_DEPENDS=numpy==1.14.5
-      cache:
-        directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.7
-        - PLAT=i686
-        - ENABLE_CONTRIB=0
-        - ENABLE_HEADLESS=0
-        - TEST_DEPENDS=numpy==1.14.5
-      cache:
-        directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.8
-        - ENABLE_CONTRIB=0
-        - ENABLE_HEADLESS=0
-        - TEST_DEPENDS=numpy==1.17.3
-      cache:
-        directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.8
-        - PLAT=i686
-        - ENABLE_CONTRIB=0
-        - ENABLE_HEADLESS=0
-        - TEST_DEPENDS=numpy==1.17.3
-      cache:
-        directories: $HOME/.ccache
-
-    # headless builds for Linux
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=2.7
-        - ENABLE_CONTRIB=0
-        - ENABLE_HEADLESS=1
-      cache:
-        directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=2.7
-        - UNICODE_WIDTH=16
-        - ENABLE_CONTRIB=0
-        - ENABLE_HEADLESS=1
-      cache:
-        directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=2.7
-        - PLAT=i686
-        - ENABLE_CONTRIB=0
-        - ENABLE_HEADLESS=1
-      cache:
-        directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=2.7
-        - PLAT=i686
-        - UNICODE_WIDTH=16
-        - ENABLE_CONTRIB=0
-        - ENABLE_HEADLESS=1
-      cache:
-        directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.5
-        - ENABLE_CONTRIB=0
-        - ENABLE_HEADLESS=1
-      cache:
-        directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.5
-        - PLAT=i686
-        - ENABLE_CONTRIB=0
-        - ENABLE_HEADLESS=1
-      cache:
-        directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.6
-        - ENABLE_CONTRIB=0
-        - ENABLE_HEADLESS=1
-        - TEST_DEPENDS=numpy==1.11.3
-      cache:
-        directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.6
-        - PLAT=i686
-        - ENABLE_CONTRIB=0
-        - ENABLE_HEADLESS=1
-        - TEST_DEPENDS=numpy==1.11.3
-      cache:
-        directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.7
-        - ENABLE_CONTRIB=0
-        - ENABLE_HEADLESS=1
-        - TEST_DEPENDS=numpy==1.14.5
-      cache:
-        directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.7
-        - PLAT=i686
-        - ENABLE_CONTRIB=0
-        - ENABLE_HEADLESS=1
-        - TEST_DEPENDS=numpy==1.14.5
-      cache:
-        directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.8
-        - ENABLE_CONTRIB=0
-        - ENABLE_HEADLESS=1
-        - TEST_DEPENDS=numpy==1.17.3
-      cache:
-        directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.8
-        - PLAT=i686
-        - ENABLE_CONTRIB=0
-        - ENABLE_HEADLESS=1
-        - TEST_DEPENDS=numpy==1.17.3
-      cache:
-        directories: $HOME/.ccache
+    # - os: linux
+    #   env:
+    #     - MB_PYTHON_VERSION=3.6
+    #     - ENABLE_CONTRIB=0
+    #     - ENABLE_HEADLESS=0
+    #     - TEST_DEPENDS=numpy==1.11.3
+    #   cache:
+    #     directories: $HOME/.ccache
+    # - os: linux
+    #   env:
+    #     - MB_PYTHON_VERSION=3.6
+    #     - PLAT=i686
+    #     - ENABLE_CONTRIB=0
+    #     - ENABLE_HEADLESS=0
+    #     - TEST_DEPENDS=numpy==1.11.3
+    #   cache:
+    #     directories: $HOME/.ccache
+    # - os: linux
+    #   env:
+    #     - MB_PYTHON_VERSION=3.7
+    #     - ENABLE_CONTRIB=0
+    #     - ENABLE_HEADLESS=0
+    #     - TEST_DEPENDS=numpy==1.14.5
+    #   cache:
+    #     directories: $HOME/.ccache
+    # - os: linux
+    #   env:
+    #     - MB_PYTHON_VERSION=3.7
+    #     - PLAT=i686
+    #     - ENABLE_CONTRIB=0
+    #     - ENABLE_HEADLESS=0
+    #     - TEST_DEPENDS=numpy==1.14.5
+    #   cache:
+    #     directories: $HOME/.ccache
+    # - os: linux
+    #   env:
+    #     - MB_PYTHON_VERSION=3.8
+    #     - ENABLE_CONTRIB=0
+    #     - ENABLE_HEADLESS=0
+    #     - TEST_DEPENDS=numpy==1.17.3
+    #   cache:
+    #     directories: $HOME/.ccache
+    # - os: linux
+    #   env:
+    #     - MB_PYTHON_VERSION=3.8
+    #     - PLAT=i686
+    #     - ENABLE_CONTRIB=0
+    #     - ENABLE_HEADLESS=0
+    #     - TEST_DEPENDS=numpy==1.17.3
+    #   cache:
+    #     directories: $HOME/.ccache
+    #
+    # # headless builds for Linux
+    # - os: linux
+    #   env:
+    #     - MB_PYTHON_VERSION=3.6
+    #     - ENABLE_CONTRIB=0
+    #     - ENABLE_HEADLESS=1
+    #     - TEST_DEPENDS=numpy==1.11.3
+    #   cache:
+    #     directories: $HOME/.ccache
+    # - os: linux
+    #   env:
+    #     - MB_PYTHON_VERSION=3.6
+    #     - PLAT=i686
+    #     - ENABLE_CONTRIB=0
+    #     - ENABLE_HEADLESS=1
+    #     - TEST_DEPENDS=numpy==1.11.3
+    #   cache:
+    #     directories: $HOME/.ccache
+    # - os: linux
+    #   env:
+    #     - MB_PYTHON_VERSION=3.7
+    #     - ENABLE_CONTRIB=0
+    #     - ENABLE_HEADLESS=1
+    #     - TEST_DEPENDS=numpy==1.14.5
+    #   cache:
+    #     directories: $HOME/.ccache
+    # - os: linux
+    #   env:
+    #     - MB_PYTHON_VERSION=3.7
+    #     - PLAT=i686
+    #     - ENABLE_CONTRIB=0
+    #     - ENABLE_HEADLESS=1
+    #     - TEST_DEPENDS=numpy==1.14.5
+    #   cache:
+    #     directories: $HOME/.ccache
+    # - os: linux
+    #   env:
+    #     - MB_PYTHON_VERSION=3.8
+    #     - ENABLE_CONTRIB=0
+    #     - ENABLE_HEADLESS=1
+    #     - TEST_DEPENDS=numpy==1.17.3
+    #   cache:
+    #     directories: $HOME/.ccache
+    # - os: linux
+    #   env:
+    #     - MB_PYTHON_VERSION=3.8
+    #     - PLAT=i686
+    #     - ENABLE_CONTRIB=0
+    #     - ENABLE_HEADLESS=1
+    #     - TEST_DEPENDS=numpy==1.17.3
+    #   cache:
+    #     directories: $HOME/.ccache
 
     # contrib builds for Linux
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=2.7
-        - ENABLE_CONTRIB=1
-        - ENABLE_HEADLESS=0
-      cache:
-        directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=2.7
-        - UNICODE_WIDTH=16
-        - ENABLE_CONTRIB=1
-        - ENABLE_HEADLESS=0
-      cache:
-        directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=2.7
-        - PLAT=i686
-        - ENABLE_CONTRIB=1
-        - ENABLE_HEADLESS=0
-      cache:
-        directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=2.7
-        - PLAT=i686
-        - UNICODE_WIDTH=16
-        - ENABLE_CONTRIB=1
-        - ENABLE_HEADLESS=0
-      cache:
-        directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.5
-        - ENABLE_CONTRIB=1
-        - ENABLE_HEADLESS=0
-      cache:
-        directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.5
-        - PLAT=i686
-        - ENABLE_CONTRIB=1
-        - ENABLE_HEADLESS=0
-      cache:
-        directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.6
-        - TEST_DEPENDS=numpy==1.11.3
-        - ENABLE_CONTRIB=1
-        - ENABLE_HEADLESS=0
-      cache:
-        directories: $HOME/.ccache
-    - os: linux
+    - stage: final
+      os: linux
+    # - os: linux
       env:
         - MB_PYTHON_VERSION=3.6
-        - PLAT=i686
         - TEST_DEPENDS=numpy==1.11.3
         - ENABLE_CONTRIB=1
         - ENABLE_HEADLESS=0
       cache:
         directories: $HOME/.ccache
+    # - os: linux
+    #   env:
+    #     - MB_PYTHON_VERSION=3.6
+    #     - PLAT=i686
+    #     - TEST_DEPENDS=numpy==1.11.3
+    #     - ENABLE_CONTRIB=1
+    #     - ENABLE_HEADLESS=0
+    #   cache:
+    #     directories: $HOME/.ccache
     - os: linux
       env:
         - MB_PYTHON_VERSION=3.7
@@ -511,15 +308,15 @@ matrix:
         - ENABLE_HEADLESS=0
       cache:
         directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.7
-        - PLAT=i686
-        - TEST_DEPENDS=numpy==1.14.5
-        - ENABLE_CONTRIB=1
-        - ENABLE_HEADLESS=0
-      cache:
-        directories: $HOME/.ccache
+    # - os: linux
+    #   env:
+    #     - MB_PYTHON_VERSION=3.7
+    #     - PLAT=i686
+    #     - TEST_DEPENDS=numpy==1.14.5
+    #     - ENABLE_CONTRIB=1
+    #     - ENABLE_HEADLESS=0
+    #   cache:
+    #     directories: $HOME/.ccache
     - os: linux
       env:
         - MB_PYTHON_VERSION=3.8
@@ -528,65 +325,18 @@ matrix:
         - ENABLE_HEADLESS=0
       cache:
         directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.8
-        - PLAT=i686
-        - TEST_DEPENDS=numpy==1.17.3
-        - ENABLE_CONTRIB=1
-        - ENABLE_HEADLESS=0
-      cache:
-        directories: $HOME/.ccache
+    # - os: linux
+    #   env:
+    #     - MB_PYTHON_VERSION=3.8
+    #     - PLAT=i686
+    #     - TEST_DEPENDS=numpy==1.17.3
+    #     - ENABLE_CONTRIB=1
+    #     - ENABLE_HEADLESS=0
+    #   cache:
+    #     directories: $HOME/.ccache
 
 
     # headless contrib builds for Linux
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=2.7
-        - ENABLE_CONTRIB=1
-        - ENABLE_HEADLESS=1
-      cache:
-        directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=2.7
-        - UNICODE_WIDTH=16
-        - ENABLE_CONTRIB=1
-        - ENABLE_HEADLESS=1
-      cache:
-        directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=2.7
-        - PLAT=i686
-        - ENABLE_CONTRIB=1
-        - ENABLE_HEADLESS=1
-      cache:
-        directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=2.7
-        - PLAT=i686
-        - UNICODE_WIDTH=16
-        - ENABLE_CONTRIB=1
-        - ENABLE_HEADLESS=1
-      cache:
-        directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.5
-        - ENABLE_CONTRIB=1
-        - ENABLE_HEADLESS=1
-      cache:
-        directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.5
-        - PLAT=i686
-        - ENABLE_CONTRIB=1
-        - ENABLE_HEADLESS=1
-      cache:
-        directories: $HOME/.ccache
     - os: linux
       env:
         - MB_PYTHON_VERSION=3.6
@@ -595,15 +345,15 @@ matrix:
         - ENABLE_HEADLESS=1
       cache:
         directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.6
-        - PLAT=i686
-        - TEST_DEPENDS=numpy==1.11.3
-        - ENABLE_CONTRIB=1
-        - ENABLE_HEADLESS=1
-      cache:
-        directories: $HOME/.ccache
+    # - os: linux
+    #   env:
+    #     - MB_PYTHON_VERSION=3.6
+    #     - PLAT=i686
+    #     - TEST_DEPENDS=numpy==1.11.3
+    #     - ENABLE_CONTRIB=1
+    #     - ENABLE_HEADLESS=1
+    #   cache:
+    #     directories: $HOME/.ccache
     - os: linux
       env:
         - MB_PYTHON_VERSION=3.7
@@ -612,32 +362,32 @@ matrix:
         - ENABLE_HEADLESS=1
       cache:
         directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.7
-        - PLAT=i686
-        - TEST_DEPENDS=numpy==1.14.5
-        - ENABLE_CONTRIB=1
-        - ENABLE_HEADLESS=1
-      cache:
-        directories: $HOME/.ccache
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.8
-        - TEST_DEPENDS=numpy==1.17.3
-        - ENABLE_CONTRIB=1
-        - ENABLE_HEADLESS=1
-      cache:
-        directories: $HOME/.ccache
+    # - os: linux
+    #   env:
+    #     - MB_PYTHON_VERSION=3.7
+    #     - PLAT=i686
+    #     - TEST_DEPENDS=numpy==1.14.5
+    #     - ENABLE_CONTRIB=1
+    #     - ENABLE_HEADLESS=1
+    #   cache:
+    #     directories: $HOME/.ccache
     - os: linux
       env:
         - MB_PYTHON_VERSION=3.8
-        - PLAT=i686
         - TEST_DEPENDS=numpy==1.17.3
         - ENABLE_CONTRIB=1
         - ENABLE_HEADLESS=1
       cache:
         directories: $HOME/.ccache
+    # - os: linux
+    #   env:
+    #     - MB_PYTHON_VERSION=3.8
+    #     - PLAT=i686
+    #     - TEST_DEPENDS=numpy==1.17.3
+    #     - ENABLE_CONTRIB=1
+    #     - ENABLE_HEADLESS=1
+    #   cache:
+    #     directories: $HOME/.ccache
 
 # The first line is printed in the folding header in Travis output
 before_install: |
diff --git a/multibuild b/multibuild
index 68a4af04..88a0b6f0 160000
--- a/multibuild
+++ b/multibuild
@@ -1 +1 @@
-Subproject commit 68a4af043e2adb0d9353d4a0e1f3d871203237aa
+Subproject commit 88a0b6f0eb770cf9f95792d66410e7696ce3d384
diff --git a/opencv b/opencv
index 4c71dbf0..5b6a237f 160000
--- a/opencv
+++ b/opencv
@@ -1 +1 @@
-Subproject commit 4c71dbf0af70e8728b8a791695b083540af72887
+Subproject commit 5b6a237f1a79201bf4cd994689b2751fdb3bfa68
diff --git a/opencv_contrib b/opencv_contrib
index 83e98d24..7011e1b1 160000
--- a/opencv_contrib
+++ b/opencv_contrib
@@ -1 +1 @@
-Subproject commit 83e98d2424bbe3854d4686dc6c9cf9a15812e8d7
+Subproject commit 7011e1b1cb29af35d0bd526b0060f9d592c40133