upstream/0_20160813.de74668f

Steve Langasek

@vorlon

b529f904 · Imported Upstream version 0~20160813.de74668f · Aug 15, 2016

Upstream version 0~20160813.de74668f