diff --git a/.gitslave.bundle b/.gitslave.bundle
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/project/bundles/appimage/03-build-digikam.sh b/project/bundles/appimage/03-build-digikam.sh
index e7ac314858..a56be9f5ff 100755
--- a/project/bundles/appimage/03-build-digikam.sh
+++ b/project/bundles/appimage/03-build-digikam.sh
@@ -1,161 +1,160 @@
 #! /bin/bash
 
 # Script to build digiKam under Linux
 # This script must be run as sudo
 #
 # Copyright (c) 2015-2019, Gilles Caulier, <caulier dot gilles at gmail dot com>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 #
 
 # Halt and catch errors
 set -eE
 trap 'PREVIOUS_COMMAND=$THIS_COMMAND; THIS_COMMAND=$BASH_COMMAND' DEBUG
 trap 'echo "FAILED COMMAND: $PREVIOUS_COMMAND"' ERR
 
 if [ "root" != "$USER" ]; then
     echo "This script must be run as root..."
     exit
 fi
 
 #################################################################################################
 # Manage script traces to log file
 
 mkdir -p ./logs
 exec > >(tee ./logs/build-digikam.full.log) 2>&1
 
 #################################################################################################
 
 echo "03-build-digikam.sh : build digiKam using CentOS 6."
 echo "---------------------------------------------------"
 
 #################################################################################################
 # Pre-processing checks
 
 . ./config.sh
 . ./common.sh
 ChecksRunAsRoot
 StartScript
 ChecksCPUCores
 CentOS6Adjustments
 RegisterRemoteServers
 . /opt/rh/devtoolset-6/enable
 
 #################################################################################################
 
 # Pathes rules
 ORIG_PATH="$PATH"
 ORIG_WD="`pwd`"
 
 #################################################################################################
 # Build digiKam in temporary directory and installation
 
 if [ -d "$DK_BUILDTEMP/digikam-$DK_VERSION" ] ; then
 
     echo "---------- Updating existing $DK_BUILDTEMP"
 
     cd "$DK_BUILDTEMP"
     cd digikam-$DK_VERSION
 
     git reset --hard
     git pull
 
     mkdir -p build
     cd build
 
 else
 
     echo "---------- Creating $DK_BUILDTEMP"
     mkdir -p "$DK_BUILDTEMP"
 
     if [ $? -ne 0 ] ; then
         echo "---------- Cannot create $DK_BUILDTEMP directory."
         echo "---------- Aborting..."
         exit;
     fi
 
     cd "$DK_BUILDTEMP"
     echo -e "\n\n"
     echo "---------- Downloading digiKam $DK_VERSION"
 
     git clone --progress --verbose $DK_GITURL digikam-$DK_VERSION
     cd digikam-$DK_VERSION
-    export GITSLAVE=".gitslave.bundle"
     ./download-repos
 
     if [ $? -ne 0 ] ; then
         echo "---------- Cannot clone repositories."
         echo "---------- Aborting..."
         exit;
     fi
 
     git checkout $DK_VERSION
 
     mkdir build
     cd build
 
 fi
 
 echo -e "\n\n"
 echo "---------- Configure digiKam $DK_VERSION"
 
 cmake3 -G "Unix Makefiles" .. \
       -DCMAKE_BUILD_TYPE=RelWithDebInfo \
       -DCMAKE_INSTALL_PREFIX=/usr \
       -DBUILD_TESTING=OFF \
       -DDIGIKAMSC_CHECKOUT_PO=ON \
       -DDIGIKAMSC_CHECKOUT_DOC=OFF \
       -DDIGIKAMSC_COMPILE_PO=ON \
       -DDIGIKAMSC_COMPILE_DOC=OFF \
       -DDIGIKAMSC_COMPILE_DIGIKAM=ON \
       -DENABLE_KFILEMETADATASUPPORT=OFF \
       -DENABLE_AKONADICONTACTSUPPORT=OFF \
       -DENABLE_MYSQLSUPPORT=ON \
       -DENABLE_INTERNALMYSQL=ON \
       -DENABLE_MEDIAPLAYER=ON \
       -DENABLE_DBUS=OFF \
       -DENABLE_APPSTYLES=ON \
       -DENABLE_QWEBENGINE=$DK_QTWEBENGINE \
       -DENABLE_FACESENGINE_DNN=ON \
       -DENABLE_KIO=OFF \
       -DENABLE_LEGACY=OFF \
       -Wno-dev
 
 if [ $? -ne 0 ]; then
     echo "---------- Cannot configure digiKam $DK_VERSION."
     echo "---------- Aborting..."
     exit;
 fi
 
 cat ../build/core/app/utils/digikam_version.h | grep "digikam_version\[\]" | awk '{print $6}' | tr -d '";' > $ORIG_WD/data/RELEASEID.txt
 
 echo -e "\n\n"
 echo "---------- Building digiKam $DK_VERSION"
 
 make -j$CPU_CORES
 
 if [ $? -ne 0 ]; then
     echo "---------- Cannot compile digiKam $DK_VERSION."
     echo "---------- Aborting..."
     exit;
 fi
 
 echo -e "\n\n"
 echo "---------- Installing digiKam $DK_VERSION"
 echo -e "\n\n"
 
 make install/fast && cd "$ORIG_WD" && rm -rf "$DK_BUILDTEMP"
 
 if [ $? -ne 0 ]; then
     echo "---------- Cannot install digiKam $DK_VERSION."
     echo "---------- Aborting..."
     exit;
 fi
 
 #################################################################################################
 
 export PATH=$ORIG_PATH
 
 TerminateScript
 
diff --git a/project/bundles/macports/03-build-digikam.sh b/project/bundles/macports/03-build-digikam.sh
index a0d70014ac..3a754bd6cd 100755
--- a/project/bundles/macports/03-build-digikam.sh
+++ b/project/bundles/macports/03-build-digikam.sh
@@ -1,149 +1,148 @@
 #! /bin/bash
 
 # Script to build digiKam using MacPorts
 # This script must be run as sudo
 #
 # Copyright (c) 2015-2019, Gilles Caulier, <caulier dot gilles at gmail dot com>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 #
 
 # Ask to run as root
 (( EUID != 0 )) && exec sudo -- "$0" "$@"
 
 # Halt and catch errors
 set -eE
 trap 'PREVIOUS_COMMAND=$THIS_COMMAND; THIS_COMMAND=$BASH_COMMAND' DEBUG
 trap 'echo "FAILED COMMAND: $PREVIOUS_COMMAND"' ERR
 
 #################################################################################################
 # Manage script traces to log file
 
 mkdir -p ./logs
 exec > >(tee ./logs/build-digikam.full.log) 2>&1
 
 #################################################################################################
 
 echo "03-build-digikam.sh : build digiKam using MacPorts."
 echo "---------------------------------------------------"
 
 #################################################################################################
 # Pre-processing checks
 
 . ./config.sh
 . ./common.sh
 StartScript
 ChecksRunAsRoot
 ChecksXCodeCLI
 ChecksCPUCores
 OsxCodeName
 #RegisterRemoteServers
 
 #################################################################################################
 
 # Pathes rules
 ORIG_PATH="$PATH"
 ORIG_WD="`pwd`"
 
 export PATH=$INSTALL_PREFIX/bin:/$INSTALL_PREFIX/sbin:$ORIG_PATH
 
 #################################################################################################
 # Build digiKam in temporary directory and installation
 
 if [ -d "$DK_BUILDTEMP/digikam-$DK_VERSION" ] ; then
 
     echo "---------- Updating existing $DK_BUILDTEMP"
 
     cd "$DK_BUILDTEMP"
     cd digikam-$DK_VERSION
 
     git reset --hard
     git pull
 
     mkdir -p build
 
 else
 
     echo "---------- Creating $DK_BUILDTEMP"
     mkdir -p "$DK_BUILDTEMP"
 
     if [ $? -ne 0 ] ; then
         echo "---------- Cannot create $DK_BUILDTEMP directory."
         echo "---------- Aborting..."
         exit;
     fi
 
     cd "$DK_BUILDTEMP"
     echo -e "\n\n"
     echo "---------- Downloading digiKam $DK_VERSION"
 
     git clone --progress --verbose $DK_GITURL digikam-$DK_VERSION
     cd digikam-$DK_VERSION
-    export GITSLAVE=".gitslave.bundle"
     ./download-repos
 
     if [ $? -ne 0 ] ; then
         echo "---------- Cannot clone repositories."
         echo "---------- Aborting..."
         exit;
     fi
 
     git checkout $DK_VERSION
 
     mkdir build
 
 fi
 
 echo -e "\n\n"
 echo "---------- Configure digiKam $DK_VERSION"
 
 sed -e "s/DIGIKAMSC_CHECKOUT_PO=OFF/DIGIKAMSC_CHECKOUT_PO=ON/g" ./bootstrap.macports > ./tmp.macports ; mv -f ./tmp.macports ./bootstrap.macports
 sed -e "s/DIGIKAMSC_COMPILE_PO=OFF/DIGIKAMSC_COMPILE_PO=ON/g"   ./bootstrap.macports > ./tmp.macports ; mv -f ./tmp.macports ./bootstrap.macports
 sed -e "s/DBUILD_TESTING=ON/DBUILD_TESTING=OFF/g"               ./bootstrap.macports > ./tmp.macports ; mv -f ./tmp.macports ./bootstrap.macports
 sed -e "s/DENABLE_DBUS=ON/DENABLE_DBUS=OFF/g"                   ./bootstrap.macports > ./tmp.macports ; mv -f ./tmp.macports ./bootstrap.macports
 chmod +x ./bootstrap.macports
 
 cp -f $ORIG_WD/fixbundledatapath.sh $DK_BUILDTEMP/digikam-$DK_VERSION
 
 ./fixbundledatapath.sh
 
 ./bootstrap.macports "$INSTALL_PREFIX" "debugfull" "x86_64" "-Wno-dev"
 
 if [ $? -ne 0 ]; then
     echo "---------- Cannot configure digiKam $DK_VERSION."
     echo "---------- Aborting..."
     exit;
 fi
 
 cat ./build/core/app/utils/digikam_version.h | grep "digikam_version\[\]" | awk '{print $6}' | tr -d '";' > $ORIG_WD/data/RELEASEID.txt
 
 echo -e "\n\n"
 echo "---------- Building digiKam $DK_VERSION"
 
 cd build
 make -j$CPU_CORES
 
 if [ $? -ne 0 ]; then
     echo "---------- Cannot compile digiKam $DK_VERSION."
     echo "---------- Aborting..."
     exit;
 fi
 
 echo -e "\n\n"
 echo "---------- Installing digiKam $DK_VERSION"
 echo -e "\n\n"
 
 make install/fast && cd "$ORIG_WD" && rm -rf "$DK_BUILDTEMP"
 
 if [ $? -ne 0 ]; then
     echo "---------- Cannot install digiKam $DK_VERSION."
     echo "---------- Aborting..."
     exit;
 fi
 
 #################################################################################################
 
 export PATH=$ORIG_PATH
 
 TerminateScript
diff --git a/project/bundles/mxe/03-build-digikam.sh b/project/bundles/mxe/03-build-digikam.sh
index 1a052c9d32..01d71a0424 100755
--- a/project/bundles/mxe/03-build-digikam.sh
+++ b/project/bundles/mxe/03-build-digikam.sh
@@ -1,142 +1,141 @@
 #! /bin/bash
 
 # Script to build digiKam using MXE
 # This script must be run as sudo
 #
 # Copyright (c) 2015-2019, Gilles Caulier, <caulier dot gilles at gmail dot com>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 #
 
 # Halt and catch errors
 set -eE
 trap 'PREVIOUS_COMMAND=$THIS_COMMAND; THIS_COMMAND=$BASH_COMMAND' DEBUG
 trap 'echo "FAILED COMMAND: $PREVIOUS_COMMAND"' ERR
 
 #################################################################################################
 # Manage script traces to log file
 
 mkdir -p ./logs
 exec > >(tee ./logs/build-digikam.full.log) 2>&1
 
 #################################################################################################
 
 echo "03-build-digikam.sh : build digiKam using MEX."
 echo "---------------------------------------------------"
 
 #################################################################################################
 # Pre-processing checks
 
 . ./config.sh
 . ./common.sh
 StartScript
 ChecksCPUCores
 RegisterRemoteServers
 
 #################################################################################################
 
 # Pathes rules
 ORIG_PATH="$PATH"
 ORIG_WD="`pwd`"
 
 export PATH=$MXE_BUILDROOT/usr/bin:$MXE_INSTALL_PREFIX/qt5/bin:$PATH
 cd $MXE_BUILDROOT
 
 #################################################################################################
 # Build digiKam in temporary directory and installation
 
 if [ -d "$DK_BUILDTEMP/digikam-$DK_VERSION" ] ; then
 
     echo "---------- Updating existing $DK_BUILDTEMP"
 
     cd "$DK_BUILDTEMP"
     cd digikam-$DK_VERSION
 
     git reset --hard
     git pull
 
     mkdir -p build.mxe
 
 else
 
     echo "---------- Creating $DK_BUILDTEMP"
     mkdir -p "$DK_BUILDTEMP"
 
     if [ $? -ne 0 ] ; then
         echo "---------- Cannot create $DK_BUILDTEMP directory."
         echo "---------- Aborting..."
         exit;
     fi
 
     cd "$DK_BUILDTEMP"
     echo -e "\n\n"
     echo "---------- Downloading digiKam $DK_VERSION"
 
     git clone --progress --verbose $DK_GITURL digikam-$DK_VERSION
     cd digikam-$DK_VERSION
-    export GITSLAVE=".gitslave.bundle"
     ./download-repos
 
     if [ $? -ne 0 ] ; then
         echo "---------- Cannot clone repositories."
         echo "---------- Aborting..."
         exit;
     fi
 
     git checkout $DK_VERSION
 
     mkdir build.mxe
 
 fi
 
 echo -e "\n\n"
 echo "---------- Configure digiKam $DK_VERSION"
 
 sed -e "s/DIGIKAMSC_CHECKOUT_PO=OFF/DIGIKAMSC_CHECKOUT_PO=ON/g" ./bootstrap.mxe > ./tmp.mxe ; mv -f ./tmp.mxe ./bootstrap.mxe
 sed -e "s/DIGIKAMSC_COMPILE_PO=OFF/DIGIKAMSC_COMPILE_PO=ON/g"   ./bootstrap.mxe > ./tmp.mxe ; mv -f ./tmp.mxe ./bootstrap.mxe
 sed -e "s/DBUILD_TESTING=ON/DBUILD_TESTING=OFF/g"               ./bootstrap.mxe > ./tmp.mxe ; mv -f ./tmp.mxe ./bootstrap.mxe
 sed -e "s/DENABLE_DBUS=ON/DENABLE_DBUS=OFF/g"                   ./bootstrap.mxe > ./tmp.mxe ; mv -f ./tmp.mxe ./bootstrap.mxe
 sed -e "s/DENABLE_DRMINGW=OFF/DENABLE_DRMINGW=ON/g"             ./bootstrap.mxe > ./tmp.mxe ; mv -f ./tmp.mxe ./bootstrap.mxe
 
 chmod +x ./bootstrap.mxe
 
 ./bootstrap.mxe $MXE_BUILDROOT RelWithDebInfo -DPng2Ico_EXECUTABLE=${ORIG_WD}/png2ico/png2ico
 
 if [ $? -ne 0 ]; then
     echo "---------- Cannot configure digiKam $DK_VERSION."
     echo "---------- Aborting..."
     exit;
 fi
 
 cat ./build.mxe/core/app/utils/digikam_version.h | grep "digikam_version\[\]" | awk '{print $6}' | tr -d '";' > $ORIG_WD/data/RELEASEID.txt
 
 echo -e "\n\n"
 echo "---------- Building digiKam $DK_VERSION"
 
 cd build.mxe
 make -j$CPU_CORES
 
 if [ $? -ne 0 ]; then
     echo "---------- Cannot compile digiKam $DK_VERSION."
     echo "---------- Aborting..."
     exit;
 fi
 
 echo -e "\n\n"
 echo "---------- Installing digiKam $DK_VERSION"
 echo -e "\n\n"
 
 make install/fast && cd "$ORIG_WD" && rm -rf "$DK_BUILDTEMP"
 
 if [ $? -ne 0 ]; then
     echo "---------- Cannot install digiKam $DK_VERSION."
     echo "---------- Aborting..."
     exit;
 fi
 
 #################################################################################################
 
 export PATH=$ORIG_PATH
 
 TerminateScript