upstream/6.0+20170902
bc378010 · Import upstream patch 20170902 ·