also I rebased to Etherpad's "develop" branch since the comments feature depends on it