Merge pull request #1 from node-red/master

Catch-up since original fork