Merge pull request #8 from Eric-Brison/3.2

no more location (closes #3630)
add file origin for ATTR (refs #3630)