Merge remote-tracking branch 'upstream/master'

diff --combined website/reverse.php
index d997088a04b94d5c1e33e633eab06eeed129ebe3,2f1e31eeb369cbfa1a1f7c892194f01db2e4fd1d..9660f36d8c7231e3d27e5f78f2ecc115ef73e509
--- 1/website/reverse.php
--- 2/website/reverse.php
+++ b/website/reverse.php
@@@ -65,7 -65,6 +65,7 @@@ if (isset($aPlace)) 
      $aPlace = [];
  }
  
 +logEnd($oDB, $hLog, sizeof($aPlace)?1:0);
  
  if (CONST_Debug) {
      var_dump($aPlace);
@@@ -73,8 -72,10 +73,10 @@@
  }
  
  if ($sOutputFormat == 'html') {
-     $sDataDate = chksql($oDB->getOne("select TO_CHAR(lastimportdate - '2 minutes'::interval,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1"));
+     $sDataDate = chksql($oDB->getOne("select TO_CHAR(lastimportdate,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1"));
      $sTileURL = CONST_Map_Tile_URL;
      $sTileAttribution = CONST_Map_Tile_Attribution;
  }
- include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');
+ 
+ $sOutputTemplate = ($sOutputFormat=='jsonv2' ? 'json' : $sOutputFormat);
+ include(CONST_BasePath.'/lib/template/address-'.$sOutputTemplate.'.php');