Rename from redstone.
Merge branch 'master' into nodex