upstream/0.16.11.git20171017
1f034751 · Imported upstream master from 2017-10-17 ·