bring demo changes from node33 and node36 into master
10 files changed