Merge branch 'tests/mastodon_api_controller.ex' into 'develop'