matrix-react-sdk

cdf09300 - Merge remote-tracking branch 'origin/develop' into travis/settings-cleanup-1