update to Rails 3.2.11
update to rails 3.2.11
merged upstream/master