Merge branch 'master' into merge-graph-data-structures

# Conflicts:
#	src/editor/js/structures/graph/node.ts
#	src/editor/js/structures/manageddata.ts