Re-do comment change lost in merge during #347.
Merge pull request #350 from tseaver/347-comment_change_lost_in_merge

Re-do comment change lost in merge during #347.