Alexander Belanger f0d4448f72 resolve merge conflicts with master 4 anni fa
..
client 39472e1ffa add namespace comments 4 anni fa
server f0d4448f72 resolve merge conflicts with master 4 anni fa
types f0d4448f72 resolve merge conflicts with master 4 anni fa