update #2 from apache/master