tree 3a71a961723770a8eddcff38b337e456c4ce5831
parent 578df916e85b8b799ab71d58a752d516a022940b
author Andreas Veithen <veithen@apache.org> 1458201274 +0000
committer Andreas Veithen <veithen@apache.org> 1458201274 +0000

Merge r1735371 to the 1.6 branch.