upstream/6.0+20151017
7630eace
·
Import upstream patch 20151017
·
Oct 18, 2015