Strip the text of a comment
Merge branch 'master' into test