Rails-4 Ready
Merge