upstream/0.16.11.git20171126
4f12af26 · Imported upstream master from 2017-11-26 ·