Update upstream source from tag 'upstream/0_20171228.71d4ecc'