Merge branch 'master' into '2005-connect-via-bt-error'
# Conflicts: # briar-android/src/main/java/org/briarproject/briar/android/conversation/BluetoothConnecter.java
# Conflicts: # briar-android/src/main/java/org/briarproject/briar/android/conversation/BluetoothConnecter.java