upstream/3.4.0
2cb08a49 · Import upstream version 3.4.0 ·