Add license header to a couple files.
Merge remote-tracking branch 'github/master'