Upgraded Rails to 4.1.4.
Upgraded to Rails 4.1.5.
merge upstream and bundle update