Merge "correct the license header"