matrix-js-sdk

17efc516 - Merge branch 'develop' into matthew/roomsettings2