Merge pull request #769 from sr-gi/copy-trait-config