Adding changes from 29a524e to /src/js/nodedit.editor.js