upstream/0.16.11.git20171109
0aba4647 · Imported upstream master from 2017-11-09 ·