upstream/4.2-build2004

Samuel Thibault

@sthibault

c5fa5b71 · Import Upstream version 4.2-build2004 · Jan 08, 2019

Upstream version 4.2-build2004