Nodes: type was incorrectly saved

Closes #366
Merge remote-tracking branch 'upstream/1.5' into 1.5