Merge remote branch 'friendica/master'