update copy typo
Merge remote-tracking branch 'origin/master'
Merged upstream update with working files.