Rails 4 changes

inspect again then merge