Merge remote-tracking branch 'friendica/stable' into develop