Pull request merge to work with rails 4.1.4 ruby 2.1.2