upstream/0.16.11.git20171201
6c4cf4d9 · Imported upstream master from 2017-12-01 ·