upstream/6.0+20160625
63dd558c · Import upstream patch 20160625 ·