Merge branch 'develop' of https://github.com/friendica/friendica into develop
authorRalf Thees <ralf@herrthees.de>
Mon, 22 Oct 2018 21:20:00 +0000 (23:20 +0200)
committerRalf Thees <ralf@herrthees.de>
Mon, 22 Oct 2018 21:20:00 +0000 (23:20 +0200)

Trivial merge