Merge pull request #55 from matrix-org/master