Fix editing nodes from GUI
Merge branch 'master' into gh-pages
Build