Merge remote-tracking branch 'mysociety_github/rails-3' into rails-3