comment reply fixup
Merge pull request #940 from drwelby/master

comment reply fixup
Merge branch 'master' into integration