Update Code headers, part of general code tidyup.
Merge remote-tracking branch 'origin/master'