Merge "Correctly include license info"