updated copyright notices
Merging changes from old branch into development branch
This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.