upstream/2.20180114

Laurent Bigonville

@bigon

d532cdcd · Import Upstream version 2.20180114 · May 30, 2018

Upstream version 2.20180114