Merge pull request #2 from friendica/master

Merge from main project
Merge pull request #584 from tuscanhobbit/master

Merge pull request #2 from friendica/master