Take into account m.room.power_levels changes
Merge remote-tracking branch 'origin/master' into develop