Merge comments, closes #14