Merge remote-tracking branch 'upstream/master'

diff --cc CMakeLists.txt
Simple merge

diff --cc website/reverse.php
index 56b80a5c0b001a7585f6111032574fe2d52b9472,026fa85b434b4dcabc7af6dc2ecf6db1ea3650ba..00bcf6356db1ba819058a5df6f2c8a449b5e4bd0
--- 1/website/reverse.php
--- 2/website/reverse.php
+++ b/website/reverse.php
@@@ -86,9 -87,10 +87,11 @@@ if (isset($aPlace)) 
      if ($aOutlineResult) {
          $aPlace = array_merge($aPlace, $aOutlineResult);
      }
+ } else {
+     $aPlace = [];
  }
  
 +logEnd($oDB, $hLog, sizeof($aPlace)?1:0);
  
  if (CONST_Debug) {
      var_dump($aPlace);