upstream-2.5.0
a2621d36 · Import upstream version 2.5.0 ·