Merge remote-tracking branch 'upstream/develop' into 1509-worker

diff --cc boot.php
index 22cd34e062d6fcdb4001a11ea2744b5b00cc1d41,dcf6c65b1eb3c47375c1baa0b3df95d575aa5112..5f633fd87877b37cb9ba531cdcd5b5477ca7441d
--- 1/boot.php
--- 2/boot.php
+++ b/boot.php
@@@ -17,9 -17,9 +17,9 @@@ require_once('include/dbstructure.php')
  
  define ( 'FRIENDICA_PLATFORM',     'Friendica');
  define ( 'FRIENDICA_CODENAME',     'Lily of the valley');
- define ( 'FRIENDICA_VERSION',      '3.4.1' );
+ define ( 'FRIENDICA_VERSION',      '3.4.2' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 -define ( 'DB_UPDATE_VERSION',      1188      );
 +define ( 'DB_UPDATE_VERSION',      1189      );
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );