Merge pull request #1 from friendica/master

actual