merged Travis's Node branch with 4.5.1