Merge pull request #32 from matrix-org/master