Merge branch 'feature/mastodon-api-fixes' into develop
authorRoger Braun <roger@rogerbraun.net>
Tue, 31 Oct 2017 13:53:14 +0000 (14:53 +0100)
committerRoger Braun <roger@rogerbraun.net>
Tue, 31 Oct 2017 13:53:14 +0000 (14:53 +0100)

Trivial merge