Merge upstream from apache trunk