upstream/4.0.18

Mathias Behrle

@mbehrle

cb39a9e3 · Adding upstream version 4.0.18. · Aug 07, 2018

Tagging upstream version 4.0.18.