Merge branch 'develop' into markjh/megolm

Commit

9 years ago

Merge branch 'develop' into markjh/megolm Conflicts: lib/crypto/algorithms/megolm.js