Merge pull request #4436 from hauke/attr