Fix comment editing.
Merge branch 'master' of hasgeek/funnel