upstream/0.16.11.git20171029
55278263 · Imported upstream master from 2017-10-29 ·