more protocols
Merge branch 'develop' of github.com:mikera/matrix-api into develop