Merge remote-tracking branch 'friendica/master'