Added compatibility to Rails-4.0.0.beta1
Merge pull request #2860 from starpeak/master

Added compatibility to Rails-4.0.0.beta1