Merge remote-tracking branch 'upstream/coverity_scan' into coverity_scan

Conflicts:
	.travis.yml

.travis.yml

@@ -41,7 +41,7 @@ addons:
       name: "OpenMW/openmw"
       description: "<Your project description here>"
     notification_email: 720642+scrawl@users.noreply.github.com
-    build_command_prepend: "cmake . -DBUILD_UNITTESTS=FALSE -DBUILD_OPENCS=FALSE -DBUILD_BSATOOL=FALSE -DBUILD_ESMTOOL=FALSE -DBUILD_MWINIIMPORTER=FALSE -DBUILD_LAUNCHER=FALSE"
+    build_command_prepend: "cmake . -DBUILD_UNITTESTS=FALSE -DBUILD_OPENCS=FALSE -DBUILD_BSATOOL=FALSE -DBUILD_ESMTOOL=FALSE -DBUILD_LAUNCHER=FALSE -DBUILD_MWINIIMPORTER=FALSE -DBUILD_WIZARD=FALSE"
     build_command:   "make -j3"
     branch_pattern: coverity_scan
 matrix: