tree 5cfa20e8509ae5780b04ea84cc1f67d9414e4ba1
parent 5bfae8cc595bcba59900878e1c450be93f254df2
author Andreas Veithen <veithen@apache.org> 1501420930 +0000
committer Andreas Veithen <veithen@apache.org> 1501420930 +0000

Merge r1735801 to the 1.7 branch.