import from apache svn  r1137309