Fix jump-to-comment-box
Merge branch 'edit' into deploy