Merge pull request #17 from nigelgbanks/7.x

Fixes invalid <source> element in the DDI form, now uses <dataSrc> for c...