Merge branch 'master' into '941-store-correct-parent-id'

# Conflicts:
#   briar-core/src/test/java/org/briarproject/briar/blog/BlogManagerImplTest.java
1 job for 941-store-correct-parent-id in 7 minutes and 54 seconds (queued for 11 minutes and 4 seconds)