fixing node-53 for the last time, hopefully.
Merge branch 'refs/heads/master' into test