Merge prusa 2.6.1

tests/slic3rutils/CMakeLists.txt

@@ -3,6 +3,7 @@ add_executable(${_TEST_NAME}_tests
     ${_TEST_NAME}_tests_main.cpp
     slic3r_jobs_tests.cpp
     slic3r_version_tests.cpp
+    slic3r_arrangejob_tests.cpp
     )
 
 # mold linker for successful linking needs also to link TBB library and link it before libslic3r.