Merge branch 'master' into '2005-connect-via-bt-error'

# Conflicts:
#   briar-android/src/main/java/org/briarproject/briar/android/conversation/BluetoothConnecter.java
3 jobs for !1446 with 2005-connect-via-bt-error in 10 minutes and 6 seconds (queued for 28 seconds)
latest merge request