Fixes to includeFields and handling matches of related fields.
Authored by: rkisson 2011-07-01
Parent: [r5400]
Child: [r5402]