Replaces indirect quote calls
Merge branch 'migration/journal_activities' into feature/rails3