Merge pull request #744 from nupplaphil/friendica-5879