upstream/6.0+20170408
9e9f3df4 · Import upstream patch 20170408 ·