Merge "Fix license headers"