upstream/6.0+20160917
9544e4e9 · Import upstream patch 20160917 ·