Include Rails3.1 Fixes