Updated master to rails 2.3.15