upstream/6.0+20171125
4eb14534 · Import upstream patch 20171125 ·