Merge pull request #282 from way2muchnoise/1.7-update

fixes hang with railcraft, #270