Merge pull request #4380 from alexanderkyte/conflicting_attrs