Merge pull request #3463 from friendica/develop
authorMichael Vogel <icarus@dabo.de>
Sun, 14 May 2017 19:08:08 +0000 (21:08 +0200)
committerGitHub <noreply@github.com>
Sun, 14 May 2017 19:08:08 +0000 (21:08 +0200)
Update 3.5.2rc with latest develop


Trivial merge