Merge branch 'cherry-pick-25d5cad7' into 'branch_4.2'

Merge branch...

See merge request nemo/nemo!185

ext/FCM/bin/fcm_internal

@@ -520,7 +520,7 @@ sub catfile {
   my $path  = shift @names;
 
   for my $name (@names) {
-    $path .= '/' . $name if $name;
+    $path .= '/' . $name if (length $name);
   }
 
   return $path;