upstream/6.0+20150810
c854975b
·
Import upstream patch 20150810
·
Aug 10, 2015