Merge branch 'master' into 'docker-build-system'

# Conflicts:
#   CI/gitlab-ci/assemble-gitlab-ci.py
Status Job ID Name Coverage
  Build
passed #93824
VS2015
VS2015-32-bit-shared-apps

00:23:40

passed #93825
VS2015
VS2015-32-bit-shared-no-apps

00:23:37

passed #93828
VS2015
VS2015-32-bit-static-apps

00:23:26

passed #93829
VS2015
VS2015-32-bit-static-no-apps

00:23:50

passed #93822
VS2015
VS2015-64-bit-shared-apps

00:34:02

passed #93823
VS2015
VS2015-64-bit-shared-no-apps

00:34:23

passed #93826
VS2015
VS2015-64-bit-static-apps

00:34:04

passed #93827
VS2015
VS2015-64-bit-static-no-apps

00:34:13

passed #93819
VS2017
VS2017-32-bit-shared-no-apps

00:22:27

passed #93821
VS2017
VS2017-32-bit-static-no-apps

00:21:10

passed #93816
Qt5101 VS2017
VS2017-64-bit-shared-apps

00:31:41

passed #93818
VS2017
VS2017-64-bit-shared-no-apps

00:30:31

passed #93817
Qt5101 VS2017
VS2017-64-bit-static-apps

00:32:49

passed #93820
VS2017
VS2017-64-bit-static-no-apps

00:31:46

passed #93806
Docker
build-debug-clang-cpp11

00:13:33

passed #93810
Docker
build-debug-clang-cpp14

00:21:26

passed #93804
Docker
build-debug-gcc-cpp11

00:03:59

passed #93808
Docker
build-debug-gcc-cpp14

00:04:02

passed #93807
Docker
build-release-clang-cpp11

00:26:24

passed #93811
Docker
build-release-clang-cpp14

00:27:41

passed #93805
Docker
build-release-gcc-cpp11

00:06:26

passed #93809
Docker
build-release-gcc-cpp14

00:06:22

passed #93803
Docker
cppcheck

00:59:34

passed #93812
Apple
macos-cpp11-debug

00:08:51

passed #93814
Apple
macos-cpp11-release

00:12:11

passed #93813
Apple
macos-cpp14-debug

00:08:50

passed #93815
Apple
macos-cpp14-release

00:12:07

 
  Test
passed #93832
Docker
test-debug-clang-cpp11

00:13:01

passed #93836
Docker
test-debug-clang-cpp14

00:07:51

passed #93830
Docker
test-debug-gcc-cpp11

00:06:25

passed #93834
Docker
test-debug-gcc-cpp14

00:05:47

passed #93833
Docker
test-release-clang-cpp11

00:09:35

passed #93837
Docker
test-release-clang-cpp14

00:12:58

passed #93831
Docker
test-release-gcc-cpp11

00:03:50

passed #93835
Docker
test-release-gcc-cpp14

00:03:27