upstream/6.1+20190803

Sven Joachim

@joachim-guest

3c9b2677 · Import upstream patch 20190803 · Aug 04, 2019

Upstream patchlevel 6.1+20190803