nodes are now ordered alphabetically
Merge branch 'node-order-fix' into develop