Copied Node change from google code svn r1846 to github