Merge branch 'master' into 'preference-switches'
# Conflicts: # briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
# Conflicts: # briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java