Rebase meshes on client-connection rebased on master

At the request of @Zidane