Merge pull request #1472 from alphagov/bump-rails-3-2-18

Bump Rails to 3.2.18