Merging from apache trunk