Merge remote-tracking branch 'origin/develop' into explicit-addressing

diff --cc CHANGELOG.md
index 5b719121109b777657ba851e807eac44fa5e9a07,8586ea8a0fcf3668cbed0ceb81415f7004c879fd..791087eb0002274defc41d29482f651e595c6a02
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -5,7 -5,7 +5,8 @@@ The format is based on [Keep a Changelo
  
  ## [unreleased]
  ### Added
+ - Add a generic settings store for frontends / clients to use.
 +- Explicit addressing option for posting.
  - Optional SSH access mode. (Needs `erlang-ssh` package on some distributions).
  - [MongooseIM](https://github.com/esl/MongooseIM) http authentication support.
  - LDAP authentication

diff --cc docs/api/differences_in_mastoapi_responses.md
Simple merge