Fixed Relation scopes for STI models.
Merge branch 'master' into rails-4