Upgrade to rails 3.2.11
Focus on the last TODO (as opposed to the first)