Update to sharejs#master