changes to prevent enter from submitting form on replies
Merge branch 'master' into feature