matrix-spec-proposals

ea19271a - Merge branch 'master' into hs/proposal-appservice-login