I updated the generator scripts so that they place copyright notices.
I cleared files so that we can update timestamps.
I restored the files in question.
Merge branch 'next' into sam_47