Merge remote branch 'upstream/master'

diff --cc boot.php
index e9f9efd70d5ee8c9c06ada5d60b467a54ac53b9a,f348ae6e895be5d2478686df7f259c0de22e3d1b..ada0f563d992a52f025d833dbf5bb5c2b7116377
--- 1/boot.php
--- 2/boot.php
+++ b/boot.php
@@@ -9,9 -9,9 +9,9 @@@ require_once('include/nav.php')
  require_once('include/cache.php');
  
  define ( 'FRIENDICA_PLATFORM',     'Friendica');
- define ( 'FRIENDICA_VERSION',      '2.3.1263' );
+ define ( 'FRIENDICA_VERSION',      '2.3.1264' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 -define ( 'DB_UPDATE_VERSION',      1126      );
 +define ( 'DB_UPDATE_VERSION',      1127      );
  
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );

diff --cc include/Scrape.php
Simple merge