Merge branch 'develop' into next

test/cryfs-cli/program_options/ParserTest.cpp

@@ -1,6 +1,7 @@
 #include "testutils/ProgramOptionsTestBase.h"
 #include <cryfs-cli/program_options/Parser.h>
 #include <cryfs/config/CryCipher.h>
+#include <cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround.h>
 
 using namespace cryfs;
 using namespace cryfs::program_options;

test/gitversion/ParserTest.cpp

@@ -1,6 +1,5 @@
 #include <gtest/gtest.h>
 #include <gitversion/parser.h>
-#include <cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround.h>
 
 using namespace gitversion;