No more windows branch.
Merge branch 'master' into node-v011