upstream/6.0+20170827
fcd3e48c · Import upstream patch 20170827 ·