Prefix options.attributes in find/findall if need by (includes)
Merge pull request #1193 from mickhansen/include-attributes-fix

Prefix options.attributes in find/findall if need by (fixes #1190)