Partially applying pull request #1 - keeping license information as other ASF projects do
Merge branch '1_2_X'