upstream/6.0+20170708
8369bb24 · Import upstream patch 20170708 ·