Merge branch 'develop' of https://github.com/friendica/friendica into develop
authorRalf Thees <ralf@herrthees.de>
Sat, 20 Oct 2018 12:33:03 +0000 (14:33 +0200)
committerRalf Thees <ralf@herrthees.de>
Sat, 20 Oct 2018 12:33:03 +0000 (14:33 +0200)

Trivial merge