Merge pull request #1311 from lordofhyphens/nosend-comment