Merge branch 'develop' into 'nondiscoverable-user-metadata'

# Conflicts:
#   CHANGELOG.md

diff --cc CHANGELOG.md
index a7a4f08ae20f27b41a4676fdab3723b5cf0c4ca2,f7a372e1110dc3587054fc52d71fb598d9cf681e..6072d4cbe512c6bc7a36bf774f3f0f876638d622
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -9,7 -9,7 +9,8 @@@ The format is based on [Keep a Changelo
  
  - Renamed `:await_up_timeout` in `:connections_pool` namespace to `:connect_timeout`, old name is deprecated.
  - Renamed `:timeout` in `pools` namespace to `:recv_timeout`, old name is deprecated.
 +- The `discoverable` field in the `User` struct will now add a NOINDEX metatag to profile pages when false.
+ - Minimum lifetime for ephmeral activities changed to 10 minutes and made configurable (`:min_lifetime` option).
  
  ### Removed