Be sure to merge from upstream. This line was changed in a later commit.