Upgraded to Ruby2/Rails4