merge with dev

AUTHORS.txt

@@ -39,6 +39,7 @@ Development contributors, in last name alphabetical order:
 Other contributors (profiles, ideas, mockups, testing, forum activity, translations, etc.), in last name alphabetical order:
 
   Marcin Bajor
+  Javier Bartol
   Thorsten Bartolomäus
   Patrik Brunner
   Fernando Carello

rtengine/rt_algo.cc

@@ -352,7 +352,7 @@ void buildBlendMask(const float* const * luminance, float **blend, int W, int H,
                     contrastThreshold = calcContrastThreshold(luminance, minY, minX, tilesize);
                     break;
                 } else {
-                    // in second pass we allow a variance of 4
+                    // in second pass we allow a variance of 8
                     // we additionally scan the tiles +-skip pixels around the best tile from pass 2
                     // Means we scan (2 * skip + 1)^2 tiles in this step to get a better hit rate
                     // fortunately the scan is quite fast, so we use only one core and don't parallelize