Merge pull request #1464 from apache/tristan/apache-license

Relicensing under the Apache License 2.0