Merge pull request #884 from nupplaphil/bug/friendica-7299