Merge pull request #4833 from ctiller/copydah

Copyright fix