Merge pull request #41 from apache/LicenseSwap

License swap