Actually fixed editor(.js) scrolling
Merge remote-tracking branch 'upstream/master'