Merge branch 'develop' of https://github.com/friendica/friendica into develop
authorRalf Thees <ralf@herrthees.de>
Tue, 25 Sep 2018 20:19:26 +0000 (22:19 +0200)
committerRalf Thees <ralf@herrthees.de>
Tue, 25 Sep 2018 20:19:26 +0000 (22:19 +0200)

Trivial merge