upstream/6.0+20160213
a25949ff · Import upstream patch 20160213 ·