Fix for breaking ActiveRecord tests
Merge branch 'group_by_alias_workaround'