Merge branch 'develop' of https://github.com/friendica/friendica into develop
authorRalf Thees <ralf@herrthees.de>
Tue, 23 Oct 2018 15:18:23 +0000 (17:18 +0200)
committerRalf Thees <ralf@herrthees.de>
Tue, 23 Oct 2018 15:18:23 +0000 (17:18 +0200)

Trivial merge